Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 46955 invoked from network); 10 Dec 2009 03:44:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Dec 2009 03:44:01 -0000 Received: (qmail 70426 invoked by uid 500); 10 Dec 2009 03:44:01 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 70314 invoked by uid 500); 10 Dec 2009 03:44:00 -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 70304 invoked by uid 99); 10 Dec 2009 03:44:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Dec 2009 03:44:00 +0000 X-ASF-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00 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:43:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1295423889C5; Thu, 10 Dec 2009 03:43:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r889078 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Date: Thu, 10 Dec 2009 03:43:33 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091210034335.1295423889C5@eris.apache.org> Author: dkulp Date: Thu Dec 10 03:43:32 2009 New Revision: 889078 URL: http://svn.apache.org/viewvc?rev=889078&view=rev Log: Merged revisions 889067 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r889067 | dkulp | 2009-12-09 22:15:37 -0500 (Wed, 09 Dec 2009) | 1 line [CXF-2551] Add some NPE checks into the ServletController ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=889078&r1=889077&r2=889078&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original) +++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Thu Dec 10 03:43:32 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);