cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ulhasbh...@apache.org
Subject svn commit: r587148 - in /incubator/cxf/trunk: rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
Date Mon, 22 Oct 2007 16:38:02 GMT
Author: ulhasbhole
Date: Mon Oct 22 09:37:57 2007
New Revision: 587148

URL: http://svn.apache.org/viewvc?rev=587148&view=rev
Log:
* Cleaned up sysm.out in system test for default servant and wsdlquery combination.
* fixed potential null pointer exception scenario.


Modified:
    incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java

Modified: incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=587148&r1=587147&r2=587148&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Mon Oct 22 09:37:57 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/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java?rev=587148&r1=587147&r2=587148&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
(original)
+++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/factory_pattern/MultiplexHttpAddressClientServerTest.java
Mon Oct 22 09:37:57 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