@@ -1413,22 +1413,26 @@ public final class MemcachedClient extends SpyThread { } public T get() throws InterruptedException, ExecutionException { - latch.await(globalOperationTimeout, TimeUnit.MILLISECONDS); - assert isDone() : "Latch released, but operation wasn't done."; - if(op != null && op.hasErrored()) { - throw new ExecutionException(op.getException()); - } - if(isCancelled()) { - throw new ExecutionException(new RuntimeException("Cancelled")); + try { + return get(globalOperationTimeout, TimeUnit.MILLISECONDS); + } catch (TimeoutException e) { + throw new RuntimeException( + "Timed out waiting for operation", e); } - return objRef.get(); } public T get(long duration, TimeUnit units) - throws InterruptedException, TimeoutException { + throws InterruptedException, TimeoutException, ExecutionException { if(!latch.await(duration, units)) { throw new TimeoutException("Timed out waiting for operation"); } + if(op != null && op.hasErrored()) { + throw new ExecutionException(op.getException()); + } + if(isCancelled()) { + throw new ExecutionException(new RuntimeException("Cancelled")); + } + return objRef.get(); } src/main/java/net/spy/memcached/MemcachedClient.java 0be1844a79e2d9ecd635e770faf479f3a221be87 Dustin Sallings dustin@spy.net http://github.com/dustin/java-memcached-client/commit/f1969bf1f88b62a71dcc9f392c4c9f0756fcea09 f1969bf1f88b62a71dcc9f392c4c9f0756fcea09 2008-05-13T22:20:37-07:00 2008-05-13T22:19:42-07:00 Some refactoring in the futures to get more consistent behavior. 8aafba90a32922014e8babb98c2af083de0fcd09 Dustin Sallings dustin@spy.net