You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/15 20:52:28 UTC
svn commit: r1769879 - in
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias:
AbstractFixedVirtualHostNodeAlias.java HostNameAliasImpl.java
Author: rgodfrey
Date: Tue Nov 15 20:52:28 2016
New Revision: 1769879
URL: http://svn.apache.org/viewvc?rev=1769879&view=rev
Log:
QPID-7513 : Make PatternMatchingVirtualHostAlias behave sensibly when no explict VirtualHostNode is provided
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java?rev=1769879&r1=1769878&r2=1769879&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java Tue Nov 15 20:52:28 2016
@@ -22,6 +22,7 @@ package org.apache.qpid.server.virtualho
import java.util.Map;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.FixedVirtualHostNodeAlias;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.NamedAddressSpace;
@@ -42,17 +43,29 @@ abstract class AbstractFixedVirtualHostN
@Override
- public VirtualHostNode<?> getVirtualHostNode()
+ public final VirtualHostNode<?> getVirtualHostNode()
{
return _virtualHostNode;
}
@Override
- public NamedAddressSpace getAddressSpace(final String name)
+ public final NamedAddressSpace getAddressSpace(final String name)
{
- VirtualHostNode<?> node = matches(name) ? getVirtualHostNode() : null;
+ VirtualHostNode<?> node = null;
+ if (matches(name))
+ {
+ node = getVirtualHostNode();
+ if (node == null)
+ {
+ Broker<?> broker = getPort().getParent(Broker.class);
+ node = broker.findDefautVirtualHostNode();
+ }
+
+ }
return node == null ? null : node.getVirtualHost();
+
}
+
protected abstract boolean matches(final String name);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java?rev=1769879&r1=1769878&r2=1769879&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java Tue Nov 15 20:52:28 2016
@@ -38,12 +38,9 @@ import java.util.concurrent.locks.Reentr
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.HostNameAlias;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
-import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.Port;
-import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.model.port.AmqpPort;
public class HostNameAliasImpl
@@ -78,23 +75,6 @@ public class HostNameAliasImpl
}
- @Override
- public NamedAddressSpace getAddressSpace(final String name)
- {
- VirtualHostNode<?> node = null;
- if (matches(name))
- {
- node = getVirtualHostNode();
- if (node == null)
- {
- Broker<?> broker = getPort().getParent(Broker.class);
- node = broker.findDefautVirtualHostNode();
- }
-
- }
- return node == null ? null : node.getVirtualHost();
-
- }
@Override
protected boolean matches(final String host)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org