Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #514 from andrewgaul/handle-timeout-exception 

Propagate InterruptedException & TimeoutException
This commit is contained in:
Adrian Cole 2012-03-22 11:59:43 -07:00
parent 49c873d17a cc590fbffd
commit f27ece1b45
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/jclouds/concurrent/ExceptionParsingListenableFuture.java
View File

@ -58,6 +58,8 @@ public class ExceptionParsingListenableFuture<T> implements ListenableFuture<T>
public T get() throws InterruptedException, ExecutionException { public T get() throws InterruptedException, ExecutionException {
try { try {
return future.get(); return future.get();
} catch (InterruptedException ie) {
throw ie;
} catch (Exception e) { } catch (Exception e) {
return attemptConvert(e); return attemptConvert(e);
} }
@ -72,6 +74,10 @@ public class ExceptionParsingListenableFuture<T> implements ListenableFuture<T>
public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
try { try {
return future.get(timeout, unit); return future.get(timeout, unit);
} catch (InterruptedException ie) {
throw ie;
} catch (TimeoutException te) {
throw te;
} catch (Exception e) { } catch (Exception e) {
return attemptConvert(e); return attemptConvert(e);
} }