Merge "JERSEY-2746: RuntimeExceptions thrown by request filters do not propagate when using submit() with Futures"

Author: Marek Potociar

core-client/src/main/java/org/glassfish/jersey/client/ClientRuntime.java

@@ -151,16 +151,16 @@ public void submit(final ClientRequest request, final ResponseCallback callback)
 
             @Override
             public void run() {
-                ClientRequest processedRequest;
                 try {
-                    processedRequest = Stages.process(request, requestProcessingRoot);
-                    processedRequest = addUserAgent(processedRequest, connector.getName());
-                } catch (final AbortException aborted) {
-                    processResponse(aborted.getAbortResponse(), callback);
-                    return;
-                }
+                    ClientRequest processedRequest;
+                    try {
+                        processedRequest = Stages.process(request, requestProcessingRoot);
+                        processedRequest = addUserAgent(processedRequest, connector.getName());
+                    } catch (final AbortException aborted) {
+                        processResponse(aborted.getAbortResponse(), callback);
+                        return;
+                    }
 
-                try {
                     final SettableFuture<ClientResponse> responseFuture = SettableFuture.create();
                     final AsyncConnectorCallback connectorCallback = new AsyncConnectorCallback() {
 

core-client/src/test/java/org/glassfish/jersey/client/JerseyInvocationTest.java

@@ -51,6 +51,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import javax.ws.rs.ProcessingException;
+import javax.ws.rs.client.AsyncInvoker;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.ClientRequestContext;
@@ -398,4 +399,26 @@ public void filter(final ClientRequestContext requestContext) throws IOException
             requestContext.abortWith(Response.ok("ENTITY").build());
         }
     }
+
+    @Test
+    public void runtimeExceptionInAsyncInvocation() throws ExecutionException, InterruptedException {
+        final AsyncInvoker ai = ClientBuilder.newClient().register(new ExceptionInvokerFilter())
+                .target("http://localhost:888/").request().async();
+
+        try {
+            ai.get().get();
+            fail("ExecutionException should be thrown");
+        } catch (ExecutionException ee) {
+            assertEquals(ProcessingException.class, ee.getCause().getClass());
+            assertEquals(RuntimeException.class, ee.getCause().getCause().getClass());
+        }
+    }
+
+    public static class ExceptionInvokerFilter implements ClientRequestFilter {
+
+        @Override
+        public void filter(final ClientRequestContext requestContext) throws IOException {
+            throw new RuntimeException("ExceptionInvokerFilter RuntimeException");
+        }
+    }
 }