Author: ritchiem
Date: Wed Feb 21 08:03:24 2007
New Revision: 510076
URL: http://svn.apache.org/viewvc?view=rev&rev=510076
Log:
QPID-348 Reverted unecessary nowait addition to amqp Basic.Recover spec.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/trunk/qpid/specs/amqp.0-8.xml
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java?view=diff&rev=510076&r1=510075&r2=510076
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
Wed Feb 21 08:03:24 2007
@@ -56,12 +56,9 @@
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));
}
}
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?view=diff&rev=510076&r1=510075&r2=510076
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Wed Feb 21 08:03:24 2007
@@ -838,7 +838,6 @@
_connection.getProtocolHandler().syncWrite(BasicRecoverBody.createAMQFrame(_channelId,
getProtocolMajorVersion(),
getProtocolMinorVersion(),
-
false, // nowait
false) // requeue
, BasicRecoverOkBody.class);
Modified: incubator/qpid/trunk/qpid/specs/amqp.0-8.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/specs/amqp.0-8.xml?view=diff&rev=510076&r1=510075&r2=510076
==============================================================================
--- incubator/qpid/trunk/qpid/specs/amqp.0-8.xml (original)
+++ incubator/qpid/trunk/qpid/specs/amqp.0-8.xml Wed Feb 21 08:03:24 2007
@@ -2513,16 +2513,7 @@
recipient. If this bit is 1, the server will attempt to requeue the
message, potentially then delivering it to an alternative subscriber.
</doc>
- </field>
- <field name = "nowait" type = "bit">
- do not send a reply method
- <doc>
- If set, the server will not respond to the method. The client should
- not wait for a reply method. If the server could not complete the
- method it will raise a channel or connection exception.
- </doc>
- </field>
-
+ </field>
<doc name="rule">
The server MUST set the redelivered flag on all messages that are resent.
</doc>
