cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r589682 - in /incubator/cxf/branches/2.0.x-fixes: ./ parent/pom.xml rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Date Mon, 29 Oct 2007 15:37:01 GMT
Author: dkulp
Date: Mon Oct 29 08:36:59 2007
New Revision: 589682

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

........
  r588518 | ningjiang | 2007-10-26 00:27:41 -0400 (Fri, 26 Oct 2007) | 1 line
  
  CXF-1134 fixed the rm systest error, also added the checking of addr length
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java

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

Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=589682&r1=589681&r2=589682&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Mon Oct 29 08:36:59 2007
@@ -954,14 +954,7 @@
                                 <property>
                                     <name>spring.validation.mode</name>
                                     <value>${spring.validation.mode}</value>
-                                </property>
-                                <property>
-                                    <!-- If we close the port after a client in the same
JVM has oppened a keep-alive
-                                    connection, on some Linux's, the socket remains consumed
until
-                                    some timeout occurs.   That may cause some tests to timeout/hang.
-->
-                                    <name>org.apache.cxf.transports.http_jetty.DontClosePort</name>
-                                    <value>true</value>
-                                </property>
+                                </property>                                
                             </systemProperties>
                         </configuration>
                     </plugin>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=589682&r1=589681&r2=589682&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Mon Oct 29 08:36:59 2007
@@ -174,7 +174,8 @@
     }
 
     private String removeTrailingSeparator(String addr) {
-        if (addr != null && addr.lastIndexOf('/') == addr.length() - 1) {
+        if (addr != null && addr.length() > 0 
+            && addr.lastIndexOf('/') == addr.length() - 1) {
             return addr.substring(0, addr.length() - 1);
         } else {
             return addr;

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java?rev=589682&r1=589681&r2=589682&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java
Mon Oct 29 08:36:59 2007
@@ -808,6 +808,8 @@
         if (!doTestOnewayMessageLoss) {
             return;
         }
+        // waite a while for the last bus shutdown
+        Thread.sleep(5000);
         testOnewayMessageLoss(null);
     }
     



Mime
View raw message