0
@@ -1413,22 +1413,26 @@
0
     }
0
 
0
     public T get() throws InterruptedException, ExecutionException {
0
-			latch.await(globalOperationTimeout, TimeUnit.MILLISECONDS);
0
-			assert isDone() : "Latch released, but operation wasn't done.";
0
-			if(op != null && op.hasErrored()) {
0
-				throw new ExecutionException(op.getException());
0
+			try {
0
+				return get(globalOperationTimeout, TimeUnit.MILLISECONDS);
0
+			} catch (TimeoutException e) {
0
+				throw new RuntimeException(
0
+					"Timed out waiting for operation", e);
0
       }
0
-			if(isCancelled()) {
0
-				throw new ExecutionException(new RuntimeException("Cancelled"));
0
-			}
0
-			return objRef.get();
0
     }
0
 
0
     public T get(long duration, TimeUnit units)
0
-			throws InterruptedException, TimeoutExceptionException {
0
+			throws InterruptedException, TimeoutException, ExecutionException {
0
       if(!latch.await(duration, units)) {
0
         throw new TimeoutException("Timed out waiting for operation");
0
       }
0
+			if(op != null && op.hasErrored()) {
0
+				throw new ExecutionException(op.getException());
0
+			}
0
+			if(isCancelled()) {
0
+				throw new ExecutionException(new RuntimeException("Cancelled"));
0
+			}
0
+
0
       return objRef.get();
0
     }
0