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

michaelklishin · michaelklishin · commit c2df18fe9cd0 · 2015-05-07T02:29:03.000+03:00
More sensible handling of InterruptedExceptions
diff --git a/src/com/rabbitmq/client/impl/AMQChannel.java b/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.
diff --git a/src/com/rabbitmq/client/impl/AMQConnection.java b/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);
diff --git a/src/com/rabbitmq/client/impl/WorkPool.java b/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) {
diff --git a/src/com/rabbitmq/tools/Tracer.java b/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) {
diff --git a/src/com/rabbitmq/utility/SingleShotLinearTimer.java b/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();
                     }
                 }
                 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public boolean addWorkItem(K key, W item) {`
`196`	`196`	`try {`
`197`	`197`	`queue.put(item);`
`198`	`198`	`} catch (InterruptedException e) {`
`199`		`- // ok`
	`199`	`+ Thread.currentThread().interrupt();`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`synchronized (this) {`
Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,8 @@ public void run() {`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
`219`		`- private void waitAndLogException(BlockingCell<Exception> bc) {`
`220`		`- reportAndLogNonNullException(bc.uninterruptibleGet());`
	`219`	`+ private void waitAndLogException(BlockingCell<Exception> bc) throws InterruptedException {`
	`220`	`+ reportAndLogNonNullException(bc.get());`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`private void reportAndLogNonNullException(Exception e) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void run() {`
`80`	`80`	`wait(_runTime - now);`
`81`	`81`	`}`
`82`	`82`	`} catch (InterruptedException e) {`
`83`		`- // Don't care`
	`83`	`+ Thread.currentThread().interrupt();`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`