You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/08/02 16:45:27 UTC

[3/4] cxf git commit: The latest JDK on Mac seems to throw a timeout exception instead of a connect exception.

The latest JDK on Mac seems to throw a timeout exception instead of a connect exception.

# Conflicts:
#	systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/69df6930
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/69df6930
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/69df6930

Branch: refs/heads/3.1.x-fixes
Commit: 69df693042703c213d7a99a75dd9aab3118690b1
Parents: e899c32
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Aug 2 11:38:01 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Aug 2 12:45:15 2017 -0400

----------------------------------------------------------------------
 .../org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/69df6930/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
index d82c6ad..ac02cce 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
@@ -110,7 +110,8 @@ public class WSAPureWsdlTest extends AbstractWSATestBase {
         } catch (Exception t) {
             //expected
             assertTrue(t.getCause().getCause().toString(),
-                       t.getCause().getCause() instanceof  java.net.ConnectException);
+                       t.getCause().getCause() instanceof java.net.ConnectException
+                       ||  t.getCause().getCause() instanceof java.net.SocketTimeoutException);
         }
         synchronized (handler) {
             port.addNumbersAsync(25,  25, handler);
@@ -280,4 +281,4 @@ public class WSAPureWsdlTest extends AbstractWSATestBase {
         assertNotNull("Service is null ", service);
         return service.getAddNumbersPort();
     }
-}
\ No newline at end of file
+}