[jbossws-commits] JBossWS SVN: r3542 - branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-06-12 04:25:32 -0400 (Tue, 12 Jun 2007)
New Revision: 3542

Modified:
   branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java
   branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java
Log:
Fix tokenizer issue with leading '/'

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java	2007-06-11 21:37:00 UTC (rev 3541)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleContextRootDeployer.java	2007-06-12 08:25:32 UTC (rev 3542)
@@ -23,6 +23,8 @@
 
 //$Id$
 
+import java.util.StringTokenizer;
+
 import org.jboss.wsf.spi.deployment.ContextRootDeployer;
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.Endpoint;
@@ -52,13 +54,14 @@
             String urlPattern = getUrlPattern(dep, ep);
             if (urlPattern != null)
             {
-               String[] tokens = urlPattern.split("/");
-               if (tokens.length > 1)
+               StringTokenizer st = new StringTokenizer(urlPattern, "/");
+               if (st.countTokens() > 1)
                {
-                  if (contextRoot != null && contextRoot.equals(tokens[0]) == false)
-                     throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" +  tokens[0]);
+                  String firstToken = st.nextToken();
+                  if (contextRoot != null && contextRoot.equals(firstToken) == false)
+                     throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" +  firstToken);
 
-                  contextRoot = tokens[0];
+                  contextRoot = firstToken;
                }
             }
          }

Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java	2007-06-11 21:37:00 UTC (rev 3541)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/BackwardCompatibleURLPatternDeployer.java	2007-06-12 08:25:32 UTC (rev 3542)
@@ -23,6 +23,8 @@
 
 //$Id$
 
+import java.util.StringTokenizer;
+
 import org.jboss.wsf.spi.deployment.Deployment;
 import org.jboss.wsf.spi.deployment.Endpoint;
 import org.jboss.wsf.spi.deployment.URLPatternDeployer;
@@ -52,8 +54,8 @@
          if (urlPattern.startsWith("/") == false)
             urlPattern = "/" + urlPattern;
 
-         String[] tokens = urlPattern.split("/");
-         if (tokens.length > 1 && urlPattern.startsWith(contextRoot))
+         StringTokenizer st = new StringTokenizer(urlPattern, "/");
+         if (st.countTokens() > 1 && urlPattern.startsWith(contextRoot))
          {
             urlPattern = urlPattern.substring(contextRoot.length());
          }