[jbossws-commits] JBossWS SVN: r7988 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server.

Author: darran.lofthouse(a)jboss.com Date: 2008-08-01 11:06:07 -0400 (Fri, 01 Aug 2008) New Revision: 7988 Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java Log: [JBPAPP-1034] Incorrect schema file url for nested wsdls. Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java =================================================================== --- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-08-01 14:51:14 UTC (rev 7987) +++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2008-08-01 15:06:07 UTC (rev 7988) @@ -136,6 +136,8 @@ if (resPath != null && resPath.indexOf("/") > 0) { String resParent = resPath.substring(0, resPath.lastIndexOf("/")); + + // replace parent traversal, results in resParent == null when successfully executed while (orgLocation.startsWith("../") && resParent != null) { if (resParent.indexOf("/") > 0) @@ -151,6 +153,10 @@ resParent = null; } } + + // no parent traversal happend + if(resParent!=null) + newResourcePath = resParent +"/"+ orgLocation; } String reqPath = reqURL.getPath();