[jbossws-commits] JBossWS SVN: r4782 - stack/native/trunk/src/main/java/org/jboss/ws/core/server.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-10-17 06:54:21 -0400 (Wed, 17 Oct 2007)
New Revision: 4782

Modified:
   stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
[JBWS-1798] JBossWS cannot find local schema with relative urls

Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java	2007-10-17 10:51:32 UTC (rev 4781)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java	2007-10-17 10:54:21 UTC (rev 4782)
@@ -124,6 +124,10 @@
                if (locationAttr != null)
                {
                   String orgLocation = locationAttr.getNodeValue();
+                  
+                  while (orgLocation.startsWith("./"))
+                     orgLocation = orgLocation.substring(2);
+                  
                   boolean isAbsolute = orgLocation.startsWith("http://") || orgLocation.startsWith("https://");
                   if (isAbsolute == false && orgLocation.startsWith(reqURL.getPath()) == false)
                   {
@@ -149,11 +153,6 @@
                         }
                      }
 
-                     while (newResourcePath.startsWith("./"))
-                     {
-                        newResourcePath = newResourcePath.substring(2);
-                     }
-                     
                      String reqPath = reqURL.getPath();
                      String completeHost = wsdlHost;