You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/12/08 15:17:19 UTC
svn commit: r1773253 - in /qpid/java/branches/6.1.x: ./
broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java
broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
Author: kwall
Date: Thu Dec 8 15:17:19 2016
New Revision: 1773253
URL: http://svn.apache.org/viewvc?rev=1773253&view=rev
Log:
QPID-7513 : Make PatternMatchingVirtualHostAlias behave sensibly when no explict VirtualHostNode is provided
Merged from trunk with command:
svn merge -c 1769879 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java
qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 8 15:17:19 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1770236,1770716
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java?rev=1773253&r1=1773252&r2=1773253&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/AbstractFixedVirtualHostNodeAlias.java Thu Dec 8 15:17:19 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/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java?rev=1773253&r1=1773252&r2=1773253&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java (original)
+++ qpid/java/branches/6.1.x/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/HostNameAliasImpl.java Thu Dec 8 15:17:19 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