You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/10/24 10:14:47 UTC
svn commit: r1766377 - in /qpid/java/trunk/broker-plugins:
amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
Author: rgodfrey
Date: Mon Oct 24 10:14:47 2016
New Revision: 1766377
URL: http://svn.apache.org/viewvc?rev=1766377&view=rev
Log:
QPID-7642 : add null check on consumer arguments to prevent NPEs
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1766377&r1=1766376&r2=1766377&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Mon Oct 24 10:14:47 2016
@@ -137,7 +137,8 @@ public class ConsumerTarget_0_10 extends
private static boolean isPullOnly(Map<String, Object> arguments)
{
- return arguments.containsKey(PULL_ONLY_CONSUMER)
+ return arguments != null
+ && arguments.containsKey(PULL_ONLY_CONSUMER)
&& Boolean.valueOf(String.valueOf(arguments.get(PULL_ONLY_CONSUMER)));
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java?rev=1766377&r1=1766376&r2=1766377&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java Mon Oct 24 10:14:47 2016
@@ -346,7 +346,8 @@ public abstract class ConsumerTarget_0_8
private static boolean isPullOnly(FieldTable arguments)
{
- return arguments.containsKey(PULL_ONLY_CONSUMER)
+ return arguments != null
+ && arguments.containsKey(PULL_ONLY_CONSUMER)
&& Boolean.valueOf(String.valueOf(arguments.get(PULL_ONLY_CONSUMER)));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org