Merge default into bug19470

Author: Hubert Plociniczak

build.xml

@@ -44,17 +44,37 @@
   <target name="amqp-generate" depends="amqp-generate-check"
     unless="amqp.generate.notRequired" description="generate AMQP.java and AMQImpl.java from AMQP spec">
     <mkdir dir="${src.generated}/com/rabbitmq/client/"/>
-    <exec dir="." executable="python" output="${src.generated}/com/rabbitmq/client/AMQP.java">
+    <exec dir="." executable="python"
+          output="${src.generated}/com/rabbitmq/client/AMQP.java"
+    	  errorproperty="amqp.generate.error1"
+          resultproperty="amqp.generate.result1">
       <arg line="codegen.py"/>
       <arg line="header"/>
       <arg line="${AMQP_SPEC_JSON_PATH}"/>
     </exec>
+  	<fail message="Generation of AMQP.java failed with message:${line.separator}${amqp.generate.error1}">
+        <condition>
+            <not>
+                <equals arg1="${amqp.generate.result1}" arg2="0" />
+            </not>
+        </condition>
+    </fail>
     <mkdir dir="${src.generated}/com/rabbitmq/client/impl"/>
-    <exec dir="." executable="python" output="${src.generated}/com/rabbitmq/client/impl/AMQImpl.java">
+    <exec dir="." executable="python"
+          output="${src.generated}/com/rabbitmq/client/impl/AMQImpl.java"
+          errorproperty="amqp.generate.error2"
+          resultproperty="amqp.generate.result2">
       <arg line="codegen.py"/>
       <arg line="body"/>
       <arg line="${AMQP_SPEC_JSON_PATH}"/>
     </exec>
+  	<fail message="Generation of AMQPImpl.java failed with message:${line.separator}${amqp.generate.error2}">
+        <condition>
+            <not>
+                <equals arg1="${amqp.generate.result2}" arg2="0" />
+            </not>
+        </condition>
+  	</fail>
   </target>
 
   <target name="build" depends="amqp-generate">

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -540,22 +540,23 @@ public boolean processControlCommand(Command c)
         // See the detailed comments in ChannelN.processAsync.
 
         Method method = c.getMethod();
-        if (isOpen()) {
-            // Normal command.
-            if (method instanceof AMQP.Connection.Close) {
-                handleConnectionClose(c);
-                return true;
-            } else {
-                return false;
-            }
+        
+        if (method instanceof AMQP.Connection.Close) {
+            handleConnectionClose(c);
+            return true;
         } else {
-            // Quiescing.
-            if (method instanceof AMQP.Connection.CloseOk) {
-                // It's our final "RPC".
+            if (isOpen()) {
+                // Normal command.
                 return false;
             } else {
-                // Ignore all others.
-                return true;
+                // Quiescing.
+                if (method instanceof AMQP.Connection.CloseOk) {
+                    // It's our final "RPC".
+                    return false;
+                } else {
+                    // Ignore all others.
+                    return true;
+                }
             }
         }
     }