diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-10-21 09:27:15 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-10-21 09:27:15 +0000 |
| commit | 7924daede51ce20959c90d16d38930c7a92f69f1 (patch) | |
| tree | e7b1950aac80436a962a87732165edd395e61ebc /qpid/java/broker-core | |
| parent | 634fb6cf880aa0da43c906b62d846ed8c70e6ce3 (diff) | |
| download | qpid-python-7924daede51ce20959c90d16d38930c7a92f69f1.tar.gz | |
QPID-6161 : use vhost names rather than vhost node names for the name aliases
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1633324 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java index f55367a89d..b8607ccfd1 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/VirtualHostNameAliasImpl.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ManagedObjectFactoryConstructor; import org.apache.qpid.server.model.Port; +import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.model.VirtualHostNameAlias; import org.apache.qpid.server.model.VirtualHostNode; @@ -44,7 +45,8 @@ public final class VirtualHostNameAliasImpl Broker<?> broker = getPort().getParent(Broker.class); for(VirtualHostNode<?> vhn : broker.getVirtualHostNodes()) { - if(vhn.getName().equals(name)) + VirtualHost<?, ?, ?> vh = vhn.getVirtualHost(); + if(vh != null && vh.getName().equals(name)) { return vhn; } |