[jbossws-commits] JBossWS SVN: r9230 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.

[jbossws-commits at lists.jboss.org]

Author: richard.opalka at jboss.com
Date: 2009-02-04 05:23:32 -0500 (Wed, 04 Feb 2009)
New Revision: 9230

Modified:
   stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
Log:
[JBWS-2493] fix NPE

Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java	2009-02-04 10:10:52 UTC (rev 9229)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java	2009-02-04 10:23:32 UTC (rev 9230)
@@ -77,15 +77,6 @@
          EndpointInfo endpointInfo = destination.getEndpointInfo();
          String address = endpointInfo.getAddress();
          
-         // Fix invalid leading slash
-         /*
-         if (address.startsWith("/http://"))
-         {
-            address = address.substring(1);
-            endpointInfo.setAddress(address);
-         }
-         */
-         
          String path = address;
          try
          {
@@ -96,14 +87,17 @@
             // ignore
          }
          
-         if (requestURI.equals(path))
+         if (path != null)
          {
-            return destination; // exact match
+            if (requestURI.equals(path))
+            {
+               return destination; // exact match
+            }
+            else if (requestURI.startsWith(path))
+            {
+               returnValue = destination; // fallback
+            }
          }
-         else if (requestURI.startsWith(path))
-         {
-            returnValue = destination; // fallback
-         }
       }
 
       if (returnValue == null)