Author: rgodfrey
Date: Thu Dec 8 14:42:11 2016
New Revision: 1773248
URL: http://svn.apache.org/viewvc?rev=1773248&view=rev
Log:
QPID-7582 : Fix all unsafe auto-unboxing of boolean values in AMQP 1.0
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java?rev=1773248&r1=1773247&r2=1773248&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/LinkEndpoint.java
Thu Dec 8 14:42:11 2016
@@ -208,7 +208,7 @@ public abstract class LinkEndpoint<T ext
_link.handle(unsettled.getDeliveryTag(), state, settled);
}
- if (settled)
+ if (Boolean.TRUE.equals(settled))
{
settle(unsettled.getDeliveryTag());
}
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java?rev=1773248&r1=1773247&r2=1773248&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
Thu Dec 8 14:42:11 2016
@@ -550,7 +550,7 @@ public class Session_1_0 implements AMQS
}
deliveryId = deliveryId.add(UnsignedInteger.ONE);
}
- if(disposition.getSettled())
+ if(Boolean.TRUE.equals(disposition.getSettled()))
{
//TODO - check send flow
}
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java?rev=1773248&r1=1773247&r2=1773248&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorReceivingLink_1_0.java
Thu Dec 8 14:42:11 2016
@@ -148,7 +148,7 @@ public class TxnCoordinatorReceivingLink
{
Discharge discharge = (Discharge) command;
-
discharge(_session.binaryToInteger(discharge.getTxnId()), discharge.getFail());
+
discharge(_session.binaryToInteger(discharge.getTxnId()),
Boolean.TRUE.equals(discharge.getFail()));
_endpoint.updateDisposition(deliveryTag, new
Accepted(), true);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
