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 2015/06/01 12:01:51 UTC
svn commit: r1682856 - in
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias:
DefaultVirtualHostAliasImpl.java HostNameAliasImpl.java
Author: kwall
Date: Mon Jun 1 10:01:51 2015
New Revision: 1682856
URL: http://svn.apache.org/r1682856
Log:
QPID-6443: [Java Broker] Address review comments from Rob Godfrey.
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/DefaultVirtualHostAliasImpl.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/DefaultVirtualHostAliasImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/DefaultVirtualHostAliasImpl.java?rev=1682856&r1=1682855&r2=1682856&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/DefaultVirtualHostAliasImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhostalias/DefaultVirtualHostAliasImpl.java Mon Jun 1 10:01:51 2015
@@ -46,7 +46,7 @@ public final class DefaultVirtualHostAli
{
Broker<?> broker = getPort().getParent(Broker.class);
VirtualHostNode defaultVirtualHostNode = broker.findDefautVirtualHostNode();
- return defaultVirtualHostNode != null && defaultVirtualHostNode.getVirtualHost() != null ? defaultVirtualHostNode : null;
+ return defaultVirtualHostNode;
}
return null;
}
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=1682856&r1=1682855&r2=1682856&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 Mon Jun 1 10:01:51 2015
@@ -88,7 +88,7 @@ public class HostNameAliasImpl
{
Broker<?> broker = getPort().getParent(Broker.class);
VirtualHostNode defaultVirtualHostNode = broker.findDefautVirtualHostNode();
- return defaultVirtualHostNode != null && defaultVirtualHostNode.getVirtualHost() != null ? defaultVirtualHostNode : null;
+ return defaultVirtualHostNode;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org