From c2af53fa63a741e270afe13982e5a9f386d2a0f1 Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Wed, 4 Jan 2012 13:08:54 +0000
Subject: QPID-3714 : Fix for NPE in the SecurityManager when a null routing
 key is used in 0-10

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1227142 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/qpid/server/security/SecurityManager.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'java/broker')

diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
index 7d4748bcaa..2a1ae8a870 100755
--- a/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
@@ -389,8 +389,16 @@ public class SecurityManager
     private ConcurrentHashMap<String, ConcurrentHashMap<String, PublishAccessCheck>> _publishPropsCache
             = new ConcurrentHashMap<String, ConcurrentHashMap<String, PublishAccessCheck>>();
 
-    public boolean authorisePublish(final boolean immediate, final String routingKey, final String exchangeName)
+    public boolean authorisePublish(final boolean immediate, String routingKey, String exchangeName)
     {
+        if(routingKey == null)
+        {
+            routingKey = "";
+        }
+        if(exchangeName == null)
+        {
+            exchangeName = "";
+        }
         PublishAccessCheck check;
         ConcurrentHashMap<String, ConcurrentHashMap<String, PublishAccessCheck>> cache =
                 immediate ? _immediatePublishPropsCache : _publishPropsCache;
-- 
cgit v1.2.1