From 774286952bc4f15a526f5a646c70addf0bfd50e5 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Fri, 18 May 2018 15:20:37 +0800 Subject: [PATCH] --- src/org/redkale/boot/Application.java | 8 +++++++- src/org/redkale/net/Server.java | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java index 50a031ba5..d4437d3bf 100644 --- a/src/org/redkale/boot/Application.java +++ b/src/org/redkale/boot/Application.java @@ -96,6 +96,11 @@ public final class Application { */ public static final String RESNAME_SERVER_EXECUTOR = Server.RESNAME_SERVER_EXECUTOR; + /** + * 当前Server的ResourceFactory + */ + public static final String RESNAME_SERVER_RESFACTORY = Server.RESNAME_SERVER_RESFACTORY; + //本地IP地址 final InetAddress localAddress; @@ -431,7 +436,8 @@ public final class Application { if (type == Application.class) { field.set(src, application); } else if (type == ResourceFactory.class) { - field.set(src, res.name().equalsIgnoreCase("server") ? rf : (res.name().isEmpty() ? application.resourceFactory : null)); + boolean serv = RESNAME_SERVER_RESFACTORY.equals(res.name()) || res.name().equalsIgnoreCase("server"); + field.set(src, serv ? rf : (res.name().isEmpty() ? application.resourceFactory : null)); } else if (type == TransportFactory.class) { field.set(src, application.sncpTransportFactory); } else if (type == NodeSncpServer.class) { diff --git a/src/org/redkale/net/Server.java b/src/org/redkale/net/Server.java index 07258b735..054b9ab80 100644 --- a/src/org/redkale/net/Server.java +++ b/src/org/redkale/net/Server.java @@ -34,6 +34,8 @@ public abstract class Server