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

[ningjiang]

Author: ningjiang
Date: Tue May 31 03:26:23 2011
New Revision: 1129477

URL: http://svn.apache.org/viewvc?rev=1129477&view=rev
Log:
CXF-3559 Merged patch of CXF-3510 into ServletControl

Modified:
    
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java

Modified: 
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=1129477&r1=1129476&r2=1129477&view=diff
==============================================================================
--- 
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 (original)
+++ 
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
 Tue May 31 03:26:23 2011
@@ -208,8 +208,11 @@ public class ServletController extends A
         
         int len = -1;
         ServletDestination ret = null;
-        for (String path : transport.getDestinationsPaths()) {           
-            if (address.startsWith(path)
+        for (String path : transport.getDestinationsPaths()) {
+            if ((address.equals(path) 
+                || "/".equals(path) 
+                || (address.length() > path.length()
+                   && address.startsWith(path) && 
address.charAt(path.length()) == '/'))
                 && path.length() > len) {
                 ret = transport.getDestinationForPath(path);
                 len = path.length();