From commits-return-10557-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Thu Dec 10 03:16:02 2009 Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 41428 invoked from network); 10 Dec 2009 03:16:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Dec 2009 03:16:02 -0000 Received: (qmail 58294 invoked by uid 500); 10 Dec 2009 03:16:02 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 58204 invoked by uid 500); 10 Dec 2009 03:16:01 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 58195 invoked by uid 99); 10 Dec 2009 03:16:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2009 03:16:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2009 03:15:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7518523889C5; Thu, 10 Dec 2009 03:15:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r889067 - /cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Date: Thu, 10 Dec 2009 03:15:38 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091210031538.7518523889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Dec 10 03:15:37 2009 New Revision: 889067 URL: http://svn.apache.org/viewvc?rev=889067&view=rev Log: [CXF-2551] Add some NPE checks into the ServletController Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=889067&r1=889066&r2=889067&view=diff ============================================================================== --- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original) +++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Thu Dec 10 03:15:37 2009 @@ -89,8 +89,14 @@ for (String path : paths) { ServletDestination d2 = transport.getDestinationForPath(path); String ad = d2.getEndpointInfo().getAddress(); - if (ad.equals(path) - || ad.equals(lastBase + path)) { + if (ad == null + && d2.getAddress() != null + && d2.getAddress().getAddress() != null) { + ad = d2.getAddress().getAddress().getValue(); + } + if (ad != null + && (ad.equals(path) + || ad.equals(lastBase + path))) { d2.getEndpointInfo().setAddress(base + path); if (d2.getEndpointInfo().getExtensor(AddressType.class) != null) { d2.getEndpointInfo().getExtensor(AddressType.class).setLocation(base + path);