JERSEY-2728: Treat any IOExpcetion thrown from MessageBodyWorkers#writeTo(...) as a connection failure.

Change-Id: Ia7e616573c575d1c893cfe939d2e4be61f83337f

Author: Igor Dvorzhak

core-client/pom.xml

@@ -153,6 +153,12 @@
             <artifactId>hamcrest-library</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.jmockit</groupId>
+            <artifactId>jmockit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <properties>
         <java.version>1.6</java.version>

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

@@ -41,6 +41,8 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 import java.net.ConnectException;
 import java.net.NoRouteToHostException;
 import java.net.SocketTimeoutException;
@@ -59,11 +61,14 @@
 import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Variant;
 import javax.ws.rs.ext.ReaderInterceptor;
 import javax.ws.rs.ext.WriterInterceptor;
 
+import javax.net.ssl.SSLException;
+
 import org.glassfish.jersey.client.internal.LocalizationMessages;
 import org.glassfish.jersey.internal.MapPropertiesDelegate;
 import org.glassfish.jersey.internal.PropertiesDelegate;
@@ -495,11 +500,24 @@ public void writeEntity() throws IOException {
         entityWritten = true;
         ensureMediaType();
         final GenericType<?> entityType = new GenericType(getEntityType());
+        doWriteEntity(workers, entityType);
+    }
+
+    /**
+     * Added only to make the code testable.
+     *
+     * @param writeWorkers Message body workers instance used to write the entity.
+     * @param entityType   entity type.
+     * @throws IOException when {@link MessageBodyWorkers#writeTo(Object, Class, Type, Annotation[], MediaType,
+     *                     MultivaluedMap, PropertiesDelegate, OutputStream, Iterable)} throws an {@link IOException}.
+     *                     This state is always regarded as connection failure.
+     */
+    /* package */ void doWriteEntity(final MessageBodyWorkers writeWorkers, final GenericType<?> entityType) throws IOException {
         OutputStream entityStream = null;
         boolean connectionFailed = false;
         try {
             try {
-                entityStream = workers.writeTo(
+                entityStream = writeWorkers.writeTo(
                         getEntity(),
                         entityType.getRawType(),
                         entityType.getType(),
@@ -510,21 +528,8 @@ public void writeEntity() throws IOException {
                         getEntityStream(),
                         writerInterceptors);
                 setEntityStream(entityStream);
-            } catch (final ConnectException ce) {
-                // MessageBodyWorkers.writeTo() produces more general IOException, but we are only interested in specifying if
-                // the failure was caused by connection problems or by other circumstances
-                connectionFailed = true;
-                throw ce;
-            } catch (final SocketTimeoutException e) {
-                // if MessageBodyWorkers.writeTo() fails because of non-routable target, SocketTimeOutException is thrown.
-                // In that case, exception is rethrown and the connectionFailed flag is set to prevent the attempt to commit.
-                // Calling commitStream() would lead to another wait time and the final timeout time would be twice as long
-                // as described in JERSEY-1984. Depending on a system and configuration, NoRouteToHostException may be thrown
-                // instead of SocketTimeoutException (see below).
-                connectionFailed = true;
-                throw e;
-            } catch (final NoRouteToHostException e) {
-                // to cover all the cases, also NoRouteToHostException is to be handled similarly.
+            } catch (final IOException e) {
+                // JERSEY-2728 - treat SSLException as connection failure
                 connectionFailed = true;
                 throw e;
             }

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

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,21 +39,41 @@
  */
 package org.glassfish.jersey.client;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
 import java.net.URI;
 
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.WriterInterceptor;
+
 import org.glassfish.jersey.internal.MapPropertiesDelegate;
+import org.glassfish.jersey.internal.PropertiesDelegate;
+import org.glassfish.jersey.message.MessageBodyWorkers;
 
+import org.junit.Assert;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
+import mockit.Mock;
+import mockit.MockUp;
+import mockit.Mocked;
+import mockit.integration.junit4.JMockit;
+
 /**
  * {@code ClientRequest} unit tests.
  *
  * @author Marek Potociar (marek.potociar at oracle.com)
  */
+@RunWith(JMockit.class)
 public class ClientRequestTest {
 
     /**
@@ -136,4 +156,32 @@ public void testResolveProperty() {
         assertEquals("value-request", request.resolveProperty("name", "value-default"));
     }
 
+    @Test
+    public void testSSLExceptionHandling(@Mocked MessageBodyWorkers workers, @Mocked GenericType<?> entityType)
+            throws Exception {
+        JerseyClient client = new JerseyClientBuilder().build();
+        final ClientRequest request = new ClientRequest(
+                URI.create("http://example.org"),
+                client.getConfiguration(),
+                new MapPropertiesDelegate());
+
+        final IOException ioException = new IOException("Test");
+        new MockUp<MessageBodyWorkers>(workers) {
+            @Mock
+            OutputStream writeTo(Object entity, Class<?> rawType, Type type, Annotation[] annotations,
+                                 MediaType mediaType, MultivaluedMap<String, Object> httpHeaders,
+                                 PropertiesDelegate propertiesDelegate, OutputStream entityStream,
+                                 Iterable<WriterInterceptor> writerInterceptors)
+                    throws java.io.IOException, javax.ws.rs.WebApplicationException {
+                throw ioException;
+            }
+        };
+
+        try {
+            request.doWriteEntity(workers, entityType);
+            Assert.fail("An IOException exception should be thrown.");
+        } catch (IOException e) {
+            assertSame(ioException, e);
+        }
+    }
 }