Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 44190 invoked from network); 22 Oct 2007 16:38:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Oct 2007 16:38:57 -0000 Received: (qmail 8110 invoked by uid 500); 22 Oct 2007 16:38:45 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 8053 invoked by uid 500); 22 Oct 2007 16:38:45 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 8042 invoked by uid 99); 22 Oct 2007 16:38:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 09:38:45 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 16:38:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7ADE21A9832; Mon, 22 Oct 2007 09:38:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: cxf-commits@incubator.apache.org From: ulhasbhole@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071022163806.7ADE21A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; } }