QPID-1801 Added method to show failure to PrincipalPermissionsTest.java and then adjusted the ternary operator in PrincipalPermissions.java to ensure we don't pass a null into the map (see JIRA descriptions).

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@763959 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 1 insertions, 1 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
index 35b76bcf32..f852514444 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
@@ -157,7 +157,7 @@ public class PrincipalPermissions
                 AMQShortString queueName = parameters.length > 1 ? (AMQShortString) parameters[1] : null;
                 AMQShortString exchangeName = parameters.length > 2 ? (AMQShortString) parameters[2] : null;
                 //Set the routingkey to the specified value or the queueName if present
-                AMQShortString routingKey = parameters.length > 3 ? (AMQShortString) parameters[3] : queueName;
+                AMQShortString routingKey = (parameters.length > 3 && null != parameters[3]) ? (AMQShortString) parameters[3] : queueName;
 
                 // Get the queues map
                 Map create_queues = (Map) createRights.get(CREATE_QUEUES_KEY);