Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r817308 - in /cxf/branches/2.1.x-fixes: ./
 systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
Date: Mon, 21 Sep 2009 16:12:00 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20090921161200.3AB772388907@eris.apache.org>

Author: dkulp
Date: Mon Sep 21 16:11:59 2009
New Revision: 817308

URL: http://svn.apache.org/viewvc?rev=817308&view=rev
Log:
Merged revisions 817302 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r817302 | dkulp | 2009-09-21 11:57:42 -0400 (Mon, 21 Sep 2009) | 12 lines
  
  Merged revisions 817294 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r817294 | dkulp | 2009-09-21 11:40:30 -0400 (Mon, 21 Sep 2009) | 4 lines
    
    On some versions of windows (old XP's for instance),
    the testPublishOnBusyPort fails as the OS just kind of silently
    allows the publish to succeed.   We'll just log a
    warning to not cause build failures.
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java

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

Modified: cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java?rev=817308&r1=817307&r2=817308&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java (original)
+++ cxf/branches/2.1.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/ClientServerSessionTest.java Mon Sep 21 16:11:59 2009
@@ -139,18 +139,30 @@
     
     @Test
     public void testPublishOnBusyPort() {
+        boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+        
         GreeterSessionImpl implementor = new GreeterSessionImpl();
         String address = "http://localhost:9020/SoapContext/GreeterPort";
         try {
             Endpoint.publish(address, implementor);
-            fail("Should have failed to publish as the port is busy");
+            if (!isWindows) {
+                fail("Should have failed to publish as the port is busy");
+            } else {
+                System.err.println("Should have failed to publish as the port is busy, but certains "
+                                   + "of Windows allow this.");
+            }
         } catch (WebServiceException ex) {
             //ignore            
         }
         try {
             //CXF-1589
             Endpoint.publish(address, implementor);
-            fail("Should have failed to publish as the port is busy");
+            if (!isWindows) {
+                fail("Should have failed to publish as the port is busy");
+            } else {
+                System.err.println("Should have failed to publish as the port is busy, but certains "
+                                   + "of Windows allow this.");
+            }
         } catch (WebServiceException ex) {
             //ignore
         }