Merge "Findbugs + improved fix for J-484 (JERSEY-2468)"

Author: Marek Potociar

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

@@ -85,7 +85,11 @@ class InboundJaxrsResponse extends Response {
     public InboundJaxrsResponse(final ClientResponse context, final RequestScope scope) {
         this.context = context;
         this.scope = scope;
-        this.scopeInstance = scope.referenceCurrent();
+        if (this.scope != null) {
+            this.scopeInstance = scope.referenceCurrent();
+        } else {
+            this.scopeInstance = null;
+        }
     }
 
     @Override
@@ -105,7 +109,7 @@ public Object getEntity() throws IllegalStateException {
 
     @Override
     public <T> T readEntity(final Class<T> entityType) throws ProcessingException, IllegalStateException {
-        return scope.runInScope(scopeInstance, new Producer<T>() {
+        return runInScopeIfPossible(new Producer<T>() {
             @Override
             public T call() {
                 return context.readEntity(entityType);
@@ -116,7 +120,7 @@ public T call() {
     @Override
     @SuppressWarnings("unchecked")
     public <T> T readEntity(final GenericType<T> entityType) throws ProcessingException, IllegalStateException {
-        return scope.runInScope(scopeInstance, new Producer<T>() {
+        return runInScopeIfPossible(new Producer<T>() {
             @Override
             public T call() {
                 return context.readEntity(entityType);
@@ -127,7 +131,7 @@ public T call() {
     @Override
     public <T> T readEntity(final Class<T> entityType, final Annotation[] annotations)
             throws ProcessingException, IllegalStateException {
-        return scope.runInScope(scopeInstance, new Producer<T>() {
+        return runInScopeIfPossible(new Producer<T>() {
             @Override
             public T call() {
                 return context.readEntity(entityType, annotations);
@@ -139,7 +143,7 @@ public T call() {
     @SuppressWarnings("unchecked")
     public <T> T readEntity(final GenericType<T> entityType, final Annotation[] annotations)
             throws ProcessingException, IllegalStateException {
-        return scope.runInScope(scopeInstance, new Producer<T>() {
+        return runInScopeIfPossible(new Producer<T>() {
             @Override
             public T call() {
                 return context.readEntity(entityType, annotations);
@@ -162,7 +166,9 @@ public void close() throws ProcessingException {
         try {
             context.close();
         } finally {
-            scopeInstance.release();
+            if (scopeInstance != null) {
+                scopeInstance.release();
+            }
         }
     }
 
@@ -255,4 +261,12 @@ public String toString() {
                 .add("context", context)
                 .toString();
     }
+
+    private <T> T runInScopeIfPossible(Producer<T> producer) {
+        if (scope != null && scopeInstance != null) {
+            return scope.runInScope(scopeInstance, producer);
+        } else {
+            return producer.call();
+        }
+    }
 }

core-server/src/main/java/org/glassfish/jersey/server/filter/EncodingFilter.java

@@ -231,7 +231,7 @@ public boolean equals(Object obj) {
         @Override
         public int compareTo(ContentEncoding o) {
             // higher q goes first (i.e. descending order)
-            return Integer.valueOf(o.q).compareTo(q);
+            return Integer.compare(o.q, q);
         }
     }
 

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientFilterTest.java

@@ -45,6 +45,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.client.ClientRequestContext;
 import javax.ws.rs.client.ClientRequestFilter;
+import javax.ws.rs.client.ClientResponseContext;
+import javax.ws.rs.client.ClientResponseFilter;
+import javax.ws.rs.client.ResponseProcessingException;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.CacheControl;
@@ -60,6 +63,7 @@
 
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -122,4 +126,33 @@ public void filterHeaderProvidersTest() {
         assertTrue(entity.contains("private"));
         assertTrue(entity.contains("cookie-value"));
     }
+
+    public static class IOExceptionResponseFilter implements ClientResponseFilter {
+
+        @Override
+        public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws
+                IOException {
+            throw new IOException(IOExceptionResponseFilter.class.getName());
+
+        }
+    }
+
+    @Test
+    public void ioExceptionResponseFilterTest() {
+        final WebTarget target = target();
+        target.register(IOExceptionResponseFilter.class).register(LoggingFilter.class);
+
+        boolean caught = false;
+
+        try {
+            target.path("test").request().get(Response.class);
+        } catch (ResponseProcessingException e) {
+            caught = true;
+            assertNotNull(e.getCause());
+            assertEquals(IOException.class, e.getCause().getClass());
+            assertEquals(IOExceptionResponseFilter.class.getName(), e.getCause().getMessage());
+        }
+
+        assertTrue(caught);
+    }
 }