Author: rgodfrey
Date: Wed Jan 4 13:08:54 2012
New Revision: 1227142
URL: http://svn.apache.org/viewvc?rev=1227142&view=rev
Log:
QPID-3714 : Fix for NPE in the SecurityManager when a null routing key is used
in 0-10
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java?rev=1227142&r1=1227141&r2=1227142&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
Wed Jan 4 13:08:54 2012
@@ -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;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
