1 files changed, 9 insertions, 1 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
index 7d4748bcaa..2a1ae8a870 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
+++ b/qpid/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;