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

2 files changed, 3 insertions, 14 deletions

diff --git a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
index e7ff4e5ad0..a209b476cf 100644
--- a/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
+++ b/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
@@ -52,11 +52,9 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQConnectionURL;
 import org.apache.qpid.jms.ConnectionURL;
 import org.apache.qpid.server.management.plugin.HttpManagement;
-import org.apache.qpid.server.model.PatternMatchingAlias;
 import org.apache.qpid.server.model.Plugin;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.VirtualHostAlias;
 import org.apache.qpid.server.model.VirtualHostNode;
 import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHostImpl;
 import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode;
@@ -160,17 +158,6 @@ public class GroupCreator
             brokerConfiguration.setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
             brokerConfiguration.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT, _testcase.getHttpManagementPort(brokerPort));
 
-            final Map<String, Object> aliasAttributes  = new HashMap<>();
-            aliasAttributes.put(VirtualHostAlias.NAME, "testAlias");
-            aliasAttributes.put(VirtualHostAlias.TYPE, PatternMatchingAlias.TYPE_NAME);
-            aliasAttributes.put(PatternMatchingAlias.PATTERN, "test");
-            aliasAttributes.put(PatternMatchingAlias.VIRTUAL_HOST_NODE, nodeName);
-            brokerConfiguration.addObjectConfiguration(Port.class,
-                                                       TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT,
-                                                       VirtualHostAlias.class,
-                                                       aliasAttributes);
-
-
             brokerConfiguration.setObjectAttributes(VirtualHostNode.class, _virtualHostName, virtualHostNodeAttributes);
 
         }
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;
             }