diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2007-01-17 21:55:11 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2007-01-17 21:55:11 +0000 |
| commit | cc92272d1eae4f6d453c00134d74ba08fdc4146d (patch) | |
| tree | 7474e0cfa0e53c9d9f4821bfe99f9552f56cf050 /java | |
| parent | 2d7fa6fc88b7247e7e5c4218cd8aa0373aa80f13 (diff) | |
| download | qpid-python-cc92272d1eae4f6d453c00134d74ba08fdc4146d.tar.gz | |
Last of client compile errors and exceptions
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@497195 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
3 files changed, 25 insertions, 14 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 17fb7a0672..86e4df9e74 100644 --- a/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -797,7 +797,7 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi _inRecovery = inRecovery; } - public void acknowledge() throws JMSException, AMQException + public void acknowledge() throws JMSException { if (isClosed()) { @@ -868,13 +868,17 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi { public Object operation() throws JMSException { - checkNotClosed(); - long producerId = getNextProducerId(); - BasicMessageProducer producer = new BasicMessageProducer(_connection, (AMQDestination) destination, _transacted, _channelId, - AMQSession.this, _connection.getProtocolHandler(), - producerId, immediate, mandatory, waitUntilSent); - registerProducer(producerId, producer); - return producer; + try + { + checkNotClosed(); + long producerId = getNextProducerId(); + BasicMessageProducer producer = new BasicMessageProducer(_connection, (AMQDestination) destination, _transacted, _channelId, + AMQSession.this, _connection.getProtocolHandler(), + producerId, immediate, mandatory, waitUntilSent); + registerProducer(producerId, producer); + return producer; + } + catch (AMQException e) { throw new JMSException(e.toString()); } } }.execute(_connection); } diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java index fb50fc1ca9..af6349a164 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java +++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java @@ -681,16 +681,22 @@ public class BasicMessageConsumer extends Closeable implements MessageConsumer } } - public void acknowledge() throws JMSException, AMQException + public void acknowledge() throws JMSException { if(!isClosed()) { - - Iterator<Long> tags = _unacknowledgedDeliveryTags.iterator(); - while(tags.hasNext()) + try + { + Iterator<Long> tags = _unacknowledgedDeliveryTags.iterator(); + while(tags.hasNext()) + { + _session.acknowledgeMessage(tags.next(), false); + tags.remove(); + } + } + catch (AMQException e) { - _session.acknowledgeMessage(tags.next(), false); - tags.remove(); + throw new JMSException(e.toString()); } } else diff --git a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java index 38cfb31eac..5a528e6fea 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/UnprocessedMessage.java @@ -40,6 +40,7 @@ public class UnprocessedMessage public Content content; public int channelId; + public long deliveryTag; public MessageHeaders contentHeader; } |