svn commit: r964619 - in /cxf/branches/2.2.x-fixes: ./ systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java

[dkulp]

Author: dkulp
Date: Thu Jul 15 21:44:09 2010
New Revision: 964619

URL: http://svn.apache.org/viewvc?rev=964619&view=rev
Log:
Merged revisions 964618 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r964618 | dkulp | 2010-07-15 17:43:00 -0400 (Thu, 15 Jul 2010) | 2 lines
  
  [CXF-2865] Fix test on windows.
  Patch from Yaytay/Jim Talbut applied.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:964618

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=964619&r1=964618&r2=964619&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
 Thu Jul 15 21:44:09 2010
@@ -162,8 +162,9 @@ public class DispatchClientServerTest ex
             fail("should not be a SOAPFaultException");
         } catch (WebServiceException ex) {
             //expected
-            assertTrue(ex.getCause().getClass().getName(), 
-                       ex.getCause() instanceof java.net.ConnectException);
+            assertTrue(ex.getCause().getClass().getName(),
+                       ex.getCause() instanceof java.net.ConnectException
+                       || ex.getCause() instanceof 
java.net.SocketTimeoutException);
         }
         
     }