Merge pull request rabbitmq#55 from rabbitmq/rabbitmq-java-client-52

More sensible handling of InterruptedExceptions

Author: michaelklishin

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

@@ -58,7 +58,7 @@ public abstract class AMQChannel extends ShutdownNotifierComponent {
     private RpcContinuation _activeRpc = null;
 
     /** Whether transmission of content-bearing methods should be blocked */
-    public boolean _blockContent = false;
+    public volatile boolean _blockContent = false;
 
     /**
      * Construct a channel on the given connection, with the given channel number.

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

@@ -682,7 +682,9 @@ public SocketCloseWait(ShutdownSignalException sse) {
 
         public void run() {
             try {
-                _appContinuation.uninterruptibleGet();
+                _appContinuation.get();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
             } finally {
                 _running = false;
                 _channel0.notifyOutstandingRpc(cause);

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

@@ -196,7 +196,7 @@ public boolean addWorkItem(K key, W item) {
             try {
                 queue.put(item);
             } catch (InterruptedException e) {
-                // ok
+                Thread.currentThread().interrupt();
             }
 
             synchronized (this) {

src/com/rabbitmq/tools/Tracer.java

@@ -216,8 +216,8 @@ public void run() {
         }
     }
 
-    private void waitAndLogException(BlockingCell<Exception> bc) {
-        reportAndLogNonNullException(bc.uninterruptibleGet());
+    private void waitAndLogException(BlockingCell<Exception> bc) throws InterruptedException {
+        reportAndLogNonNullException(bc.get());
     }
 
     private void reportAndLogNonNullException(Exception e) {

src/com/rabbitmq/utility/SingleShotLinearTimer.java

@@ -80,7 +80,7 @@ public void run() {
                             wait(_runTime - now);
                         }
                     } catch (InterruptedException e) {
-                        // Don't care
+                        Thread.currentThread().interrupt();
                     }
                 }