cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r587266 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ systests/src/test/java/org/apache/cxf/systest/factory_pattern/
Date Mon, 22 Oct 2007 21:21:04 GMT
Author: dkulp
Date: Mon Oct 22 14:21:03 2007
New Revision: 587266

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

........
  r587148 | ulhasbhole | 2007-10-22 12:37:57 -0400 (Mon, 22 Oct 2007) | 4 lines
  
  * Cleaned up sysm.out in system test for default servant and wsdlquery combination.
  * fixed potential null pointer exception scenario.
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    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/factory_pattern/MultiplexHttpAddressClientServerTest.java

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

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=587266&r1=587265&r2=587266&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 22 14:21:03 2007
@@ -174,12 +174,13 @@
     }
 
     private String removeTrailingSeparator(String addr) {
-        if (addr.lastIndexOf('/') == addr.length() - 1) {
+        if (addr != null && addr.lastIndexOf('/') == addr.length() - 1) {
             return addr.substring(0, addr.length() - 1);
         } else {
             return addr;
         }
     }
+    
     private synchronized String updateEndpointAddress(String addr) {
         // only update the EndpointAddress if the base path is equal
         // make sure we don't broke the get operation?parament query 

Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java?rev=587266&r1=587265&r2=587266&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
Mon Oct 22 14:21:03 2007
@@ -158,10 +158,8 @@
         
         while (br.ready()) {
             String str = br.readLine();
-//            System.out.println(str);
             if (str.contains("soap:address") 
                 && str.contains("location=" + "\"" + address + "\"")) {
-                System.out.println(str);
                 return  true;
             }
         }



Mime
View raw message