Author: rgodfrey
Date: Wed May 25 08:40:43 2016
New Revision: 1745453

URL: http://svn.apache.org/viewvc?rev=1745453&view=rev
Log:
QPID-7000 : Avoid NPE when passed a null vhost name

Modified:
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1745453&r1=1745452&r2=1745453&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
 Wed May 25 08:40:43 2016
@@ -1355,7 +1355,7 @@ public class BrokerAdapter extends Abstr
         @Override
         public NamedAddressSpace getAddressSpace(final String name)
         {
-            return _systemAddressSpaces.get(name);
+            return name == null ? null : _systemAddressSpaces.get(name);
         }
 
         @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to