summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2013-09-30 11:07:11 +0000
committerRobert Godfrey <rgodfrey@apache.org>2013-09-30 11:07:11 +0000
commit81445eee4f4a51d6472fd43d6d0fb0722fbeeca6 (patch)
tree4aec198467324459a16fb1a14ae3b41c7bfd875f /qpid/java
parentc8d0fb167d8fc89fcb27823414454675b60a9dc1 (diff)
downloadqpid-python-81445eee4f4a51d6472fd43d6d0fb0722fbeeca6.tar.gz
QPID-5194 : Occaisionally see ERROR (221): Caught Exception: java.lang.IllegalArgumentException: timeout value is negative
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527511 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
index cc93725fb0..b240359002 100644
--- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
+++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
@@ -311,7 +311,7 @@ public class MessageProducerImpl implements MessageProducer, QueueSender, TopicP
throw jmsException;
}
- if(_syncPublish && !action.wasAccepted(_syncPublishTimeout + System.currentTimeMillis()))
+ if(_syncPublish && !action.wasAccepted(_syncPublishTimeout))
{
if (action.getOutcome() instanceof Rejected)
{
@@ -487,7 +487,7 @@ public class MessageProducerImpl implements MessageProducer, QueueSender, TopicP
{
try
{
- _lock.wait(timeout - System.currentTimeMillis());
+ _lock.wait(timeout);
}
catch (InterruptedException e)
{