QPID-348 Reverted unecessary nowait addition to amqp Basic.Recover spec.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@510076 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 5 insertions, 18 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java b/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
index 5a9b9b54af..bc11e4652c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRecoverMethodHandler.java
+++ b/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/java/client/src/main/java/org/apache/qpid/client/AMQSession.java b/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
index 81f5bbfcc2..ad600ddb40 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
@@ -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);
 
diff --git a/specs/amqp.0-8.xml b/specs/amqp.0-8.xml
index 8426720b67..3b0a1d5363 100644
--- a/specs/amqp.0-8.xml
+++ b/specs/amqp.0-8.xml
@@ -2513,16 +2513,7 @@ localised reply text
       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>