summaryrefslogtreecommitdiff
path: root/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
commit8fed5f005f904d94075b103a8a240ac654aa679b (patch)
tree88a19ef6da2924eabd2f8699fdede96a34ed6d4e /java
parent41e69387eacbec245c1ee66a3c35b3830b6ef0aa (diff)
downloadqpid-python-8fed5f005f904d94075b103a8a240ac654aa679b.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/qpid@1527511 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--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/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java b/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
index cc93725fb0..b240359002 100644
--- a/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/MessageProducerImpl.java
+++ b/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)
{