From 5e3718af1910b5f67f881f722af3ac7ab5c17053 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Tue, 23 May 2017 23:16:37 +0800 Subject: [PATCH] --- src/org/redkale/boot/NodeHttpServer.java | 6 +++--- src/org/redkale/boot/NodeServer.java | 8 ++++---- src/org/redkale/boot/NodeSncpServer.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/redkale/boot/NodeHttpServer.java b/src/org/redkale/boot/NodeHttpServer.java index afc5e5f27..4ccfe3c29 100644 --- a/src/org/redkale/boot/NodeHttpServer.java +++ b/src/org/redkale/boot/NodeHttpServer.java @@ -72,13 +72,13 @@ public class NodeHttpServer extends NodeServer { } @Override - protected void loadService(ClassFilter serviceFilter) throws Exception { - super.loadService(serviceFilter); + protected void loadService(ClassFilter serviceFilter, ClassFilter otherFilter) throws Exception { + super.loadService(serviceFilter, otherFilter); initWebSocketService(); } @Override - protected void loadFilter(ClassFilter filterFilter) throws Exception { + protected void loadFilter(ClassFilter filterFilter, ClassFilter otherFilter) throws Exception { if (httpServer != null) loadHttpFilter(this.serverConf.getAnyValue("filters"), filterFilter); } diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java index 55f883e58..3aff95190 100644 --- a/src/org/redkale/boot/NodeServer.java +++ b/src/org/redkale/boot/NodeServer.java @@ -170,14 +170,14 @@ public abstract class NodeServer { ClassFilter.Loader.load(application.getHome(), serverConf.getValue("excludelibs", "").split(";"), serviceFilter, filterFilter, servletFilter, otherFilter); long e = System.currentTimeMillis() - s; logger.info(this.getClass().getSimpleName() + " load filter class in " + e + " ms"); - loadService(serviceFilter); //必须在servlet之前 - loadFilter(filterFilter); + loadService(serviceFilter, otherFilter); //必须在servlet之前 + loadFilter(filterFilter, otherFilter); loadServlet(servletFilter, otherFilter); if (this.interceptor != null) this.resourceFactory.inject(this.interceptor); } - protected abstract void loadFilter(ClassFilter filterFilter) throws Exception; + protected abstract void loadFilter(ClassFilter filterFilter, ClassFilter otherFilter) throws Exception; protected abstract void loadServlet(ClassFilter servletFilter, ClassFilter otherFilter) throws Exception; @@ -307,7 +307,7 @@ public abstract class NodeServer { } @SuppressWarnings("unchecked") - protected void loadService(ClassFilter serviceFilter) throws Exception { + protected void loadService(ClassFilter serviceFilter, ClassFilter otherFilter) throws Exception { if (serviceFilter == null) return; final String threadName = "[" + Thread.currentThread().getName() + "] "; final Set> entrys = serviceFilter.getAllFilterEntrys(); diff --git a/src/org/redkale/boot/NodeSncpServer.java b/src/org/redkale/boot/NodeSncpServer.java index 4165298b8..fc856dd9e 100644 --- a/src/org/redkale/boot/NodeSncpServer.java +++ b/src/org/redkale/boot/NodeSncpServer.java @@ -81,7 +81,7 @@ public class NodeSncpServer extends NodeServer { } @Override - protected void loadFilter(ClassFilter filterFilter) throws Exception { + protected void loadFilter(ClassFilter filterFilter, ClassFilter otherFilter) throws Exception { if (sncpServer != null) loadSncpFilter(this.serverConf.getAnyValue("fliters"), filterFilter); }