diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-02-21 16:03:24 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-02-21 16:03:24 +0000 |
| commit | 272f0d2a1b2134c7cdddcc9e6e951edc696e6054 (patch) | |
| tree | e6bb1abdeebed8843162df81a660eea9c98929ea /qpid/java | |
| parent | 31348b37b0ad57ee97defdfe97d69611f019e32d (diff) | |
| download | qpid-python-272f0d2a1b2134c7cdddcc9e6e951edc696e6054.tar.gz | |
QPID-348 Reverted unecessary nowait addition to amqp Basic.Recover spec.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@510076 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java | 11 | ||||
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java | 1 |
2 files changed, 4 insertions, 8 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java index 5a9b9b54af..bc11e4652c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java @@ -56,12 +56,9 @@ public class BasicRecoverMethodHandler implements StateAwareMethodListener<Basic channel.resend(session, body.requeue); - if (!body.nowait) - { - // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) - // TODO: Connect this to the session version obtained from ProtocolInitiation for this session. - // Be aware of possible changes to parameter order as versions change. - session.writeFrame(BasicRecoverOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0)); - } + // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) + // TODO: Connect this to the session version obtained from ProtocolInitiation for this session. + // Be aware of possible changes to parameter order as versions change. + session.writeFrame(BasicRecoverOkBody.createAMQFrame(evt.getChannelId(), (byte) 8, (byte) 0)); } } diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java index 81f5bbfcc2..ad600ddb40 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java @@ -838,7 +838,6 @@ public class AMQSession extends Closeable implements Session, QueueSession, Topi _connection.getProtocolHandler().syncWrite(BasicRecoverBody.createAMQFrame(_channelId, getProtocolMajorVersion(), getProtocolMinorVersion(), - false, // nowait false) // requeue , BasicRecoverOkBody.class); |