svn commit: r889078 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java

[dkulp]

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);