Merge pull request rabbitmq#46 from dpratt/stable

michaelklishin · michaelklishin · commit a1156ad18f4a · 2015-04-23T20:26:29.000+03:00
Fix deadlock on close() with congested server.
diff --git a/src/com/rabbitmq/client/impl/ChannelN.java b/src/com/rabbitmq/client/impl/ChannelN.java
@@ -571,7 +571,9 @@ public AMQCommand transformReply(AMQCommand command) {
             // we wait for the reply. We ignore the result.
             // (It's NOT always close-ok.)
             notify = true;
-            k.getReply(-1);
+			// Should not wait indefinately, since if the server is congested
+			// the call will lock and never return. This stalls and kills the current thread.
+            k.getReply(10000);
         } catch (TimeoutException ise) {
             // Will never happen since we wait infinitely
         } catch (ShutdownSignalException sse) {
