diff --git a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java b/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java index 1d4fc493da7..a0b70b507d6 100644 --- a/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java +++ b/hornetq-server/src/main/java/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java @@ -104,6 +104,8 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle private final Map protocolMap = new ConcurrentHashMap(); + private HornetQPrincipal defaultInvmSecurityPrincipal; + // Static -------------------------------------------------------- // Constructors -------------------------------------------------- @@ -228,6 +230,11 @@ public ClassLoader run() threadPool, scheduledThreadPool); + if(defaultInvmSecurityPrincipal != null && acceptor.isUnsecurable()) + { + acceptor.setDefaultHornetQPrincipal(defaultInvmSecurityPrincipal); + } + acceptors.add(acceptor); if (managementService != null) @@ -258,6 +265,7 @@ public ClassLoader run() public synchronized void allowInvmSecurityOverride(HornetQPrincipal principal) { + defaultInvmSecurityPrincipal = principal; for (Acceptor acceptor : acceptors) { if(acceptor.isUnsecurable())