diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-12 15:13:16 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-12 15:13:16 +0000 |
| commit | 49c02f9fcf8c2dd1b063c887f8948f840ec785c2 (patch) | |
| tree | 7fa009399d501d9ad3e9f77f735d85a2b75807cf /qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java | |
| parent | d31279a6374f4fd4326d04fdae456543547d441f (diff) | |
| parent | b66b4f357a756449c7e7184be4d963fb36f5b2d4 (diff) | |
| download | qpid-python-QPID-6262-JavaBrokerNIO.tar.gz | |
Merge from trunkQPID-6262-JavaBrokerNIO
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1666219 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java index cacc981e9b..917c2fd9a1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostImpl.java @@ -48,6 +48,7 @@ import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.protocol.AMQConnectionModel; import org.apache.qpid.server.protocol.LinkRegistry; import org.apache.qpid.server.queue.AMQQueue; +import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.stats.StatisticsCounter; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.store.MessageStore; @@ -355,9 +356,9 @@ class RedirectingVirtualHostImpl } @Override - public org.apache.qpid.server.security.SecurityManager getSecurityManager() + public SecurityManager getSecurityManager() { - return null; + return super.getSecurityManager(); } @Override |