Repository: qpid-jms Updated Branches: refs/heads/master db4941afc -> 715540aea
QPIDJMS-168 fix some boxing and comparison issues Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/715540ae Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/715540ae Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/715540ae Branch: refs/heads/master Commit: 715540aea55148f55b766866a2df139a5bc6a8ef Parents: db4941a Author: Timothy Bish <[email protected]> Authored: Tue Apr 5 12:13:58 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Tue Apr 5 12:13:58 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java | 2 +- .../apache/qpid/jms/provider/amqp/AmqpTransactionCoordinator.java | 2 +- .../provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/715540ae/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java index ecbe8fc..f218fa2 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSupport.java @@ -191,7 +191,7 @@ public class AmqpSupport { int port = 0; try { - port = Integer.valueOf(info.get(PORT).toString()); + port = Integer.parseInt(info.get(PORT).toString()); } catch (Exception ex) { result = new IOException(message + " : Redirection information not set."); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/715540ae/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionCoordinator.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionCoordinator.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionCoordinator.java index f0ddf96..2fa2644 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionCoordinator.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionCoordinator.java @@ -82,7 +82,7 @@ public class AmqpTransactionCoordinator extends AmqpAbstractResource<JmsSessionI Rejected rejected = (Rejected) state; Exception cause = AmqpSupport.convertToException(getEndpoint(), rejected.getError()); JMSException failureCause = null; - if (txId.getProviderContext() == COMMIT_MARKER) { + if (txId.getProviderContext().equals(COMMIT_MARKER)) { failureCause = new TransactionRolledBackException(cause.getMessage()); } else { failureCause = new JMSException(cause.getMessage()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/715540ae/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java index 859b7b2..4c717ba 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java @@ -112,7 +112,7 @@ public class AmqpJmsMessagePropertyIntercepter { if (rc == null) { throw new JMSException("Property " + JMS_AMQP_TTL + " cannot be set from a " + value.getClass().getName() + "."); } - message.setAmqpTimeToLiveOverride(rc.longValue()); + message.setAmqpTimeToLiveOverride(rc); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
