Formatting

acogoluegnes · acogoluegnes · commit 965a6a5763a1 · 2016-12-12T17:17:42.000+01:00
diff --git a/src/main/java/com/rabbitmq/utility/BlockingCell.java b/src/main/java/com/rabbitmq/utility/BlockingCell.java
@@ -63,8 +63,9 @@ public synchronized T get() throws InterruptedException {
     public synchronized T get(long timeout) throws InterruptedException, TimeoutException {
         if (timeout == INFINITY) return get();
 
-        if (timeout < 0)
+        if (timeout < 0) {
             throw new AssertionError("Timeout cannot be less than zero");
+        }
 
         long now = System.nanoTime() / NANOS_IN_MILLI;
         long maxTime = now + timeout;
@@ -94,8 +95,9 @@ public synchronized T uninterruptibleGet() {
                 }
             }
         } finally {
-            if (wasInterrupted)
+            if (wasInterrupted) {
                 Thread.currentThread().interrupt();
+            }
         }
     }
 
@@ -122,8 +124,9 @@ public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {
                 }
             } while ((timeout == INFINITY) || ((now = System.nanoTime() / NANOS_IN_MILLI) < runTime));
         } finally {
-            if (wasInterrupted)
+            if (wasInterrupted) {
                 Thread.currentThread().interrupt();
+            }
         }
 
         throw new TimeoutException();
diff --git a/src/main/java/com/rabbitmq/utility/SingleShotLinearTimer.java b/src/main/java/com/rabbitmq/utility/SingleShotLinearTimer.java
@@ -31,7 +31,10 @@
  * package-private.
  * 
  * We currently just use this to time the quiescing RPC in AMQChannel.
- * 
+ *
+ * Will be removed in next major release.
+ *
+ * @deprecated
  * @see AMQChannel
  */
 

Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,9 @@ public synchronized T get() throws InterruptedException {`
`63`	`63`	`public synchronized T get(long timeout) throws InterruptedException, TimeoutException {`
`64`	`64`	`if (timeout == INFINITY) return get();`
`65`	`65`
`66`		`- if (timeout < 0)`
	`66`	`+ if (timeout < 0) {`
`67`	`67`	`throw new AssertionError("Timeout cannot be less than zero");`
	`68`	`+ }`
`68`	`69`
`69`	`70`	`long now = System.nanoTime() / NANOS_IN_MILLI;`
`70`	`71`	`long maxTime = now + timeout;`
`@@ -94,8 +95,9 @@ public synchronized T uninterruptibleGet() {`
`94`	`95`	`}`
`95`	`96`	`}`
`96`	`97`	`} finally {`
`97`		`- if (wasInterrupted)`
	`98`	`+ if (wasInterrupted) {`
`98`	`99`	`Thread.currentThread().interrupt();`
	`100`	`+ }`
`99`	`101`	`}`
`100`	`102`	`}`
`101`	`103`
`@@ -122,8 +124,9 @@ public synchronized T uninterruptibleGet(int timeout) throws TimeoutException {`
`122`	`124`	`}`
`123`	`125`	`} while ((timeout == INFINITY) \|\| ((now = System.nanoTime() / NANOS_IN_MILLI) < runTime));`
`124`	`126`	`} finally {`
`125`		`- if (wasInterrupted)`
	`127`	`+ if (wasInterrupted) {`
`126`	`128`	`Thread.currentThread().interrupt();`
	`129`	`+ }`
`127`	`130`	`}`
`128`	`131`
`129`	`132`	`throw new TimeoutException();`