Author: dkulp Date: Thu Dec 10 03:51:34 2009 New Revision: 889080 URL: http://svn.apache.org/viewvc?rev=889080&view=rev Log: Merged revisions 889078 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r889078 | dkulp | 2009-12-09 22:43:32 -0500 (Wed, 09 Dec 2009) | 9 lines 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.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=889080&r1=889079&r2=889080&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original) +++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Thu Dec 10 03:51:34 2009 @@ -101,8 +101,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);
