Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

As per the Future contract, throw CancellationException if the Promise has been cancelled.

This commit is contained in:
Simone Bordet 2012-06-11 14:23:53 +02:00
parent 836c647fb8
commit af836eb4b7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/Promise.java
View File

@ -16,6 +16,7 @@
package org.eclipse.jetty.spdy; package org.eclipse.jetty.spdy;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; import java.util.concurrent.Future;
@ -89,6 +90,8 @@ public class Promise<T> implements Handler<T>, Future<T>
private T result() throws ExecutionException private T result() throws ExecutionException
{ {
if (isCancelled())
throw new CancellationException();
Throwable failure = this.failure; Throwable failure = this.failure;
if (failure != null) if (failure != null)
throw new ExecutionException(failure); throw new ExecutionException(failure);