Merged bug24569 into default

Author: Emile Joubert

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

@@ -153,13 +153,17 @@ public void handleCompleteInboundCommand(AMQCommand command) throws IOException
     public void enqueueRpc(RpcContinuation k)
     {
         synchronized (_channelMutex) {
+            boolean wasInterrupted = false;
             while (_activeRpc != null) {
                 try {
                     _channelMutex.wait();
                 } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
+                    wasInterrupted = true;
                 }
             }
+            if (wasInterrupted) {
+                Thread.currentThread().interrupt();
+            }
             _activeRpc = k;
         }
     }