[Carbon-commits] [Carbon] svn commit r114459 - trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors

[janaka at wso2.com]

Author: janaka
Date: Wed Oct 19 03:24:24 2011
New Revision: 114459
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=114459

Log:
Fixing CARBON-11284

Modified:
   trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java

Modified: trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java?rev=114459&r1=114458&r2=114459&view=diff
==============================================================================
--- trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java	(original)
+++ trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java	Wed Oct 19 03:24:24 2011
@@ -141,6 +141,7 @@
                         OMElement newContent = stringToOM(new String((byte[]) newResource.getContent()));
                         setWSDLURL(newContent, oldPathNewPathMap.get(keyValueSet.getKey()));
                         newResource.setContent(newContent.toString().getBytes());
+                        continue;
                     }
                     if (tempResource.getMediaType().equals(ENDPOINT_MEDIA_TYPE)) {
                         OMElement newContent = stringToOM(new String((byte[]) newResource.getContent()));
@@ -237,6 +238,7 @@
         }
         boolean isResourceName = currentExpression.contains(RESOURCE_NAME);
         boolean isResourcePath = currentExpression.contains(RESOURCE_PATH);
+        boolean isResourceVersion = currentExpression.contains(RESOURCE_VERSION);
 
         int pathIndex = currentExpression.indexOf(RESOURCE_PATH);
         String pathPrefix = currentExpression.substring(0,pathIndex);
@@ -246,6 +248,9 @@
                 returnPath = returnPath.replace(RESOURCE_NAME, path.substring(path.lastIndexOf("/") + 1));
                 path = path.substring(0, path.lastIndexOf("/"));
             }
+            if(isResourceVersion){
+                path = path.substring(0, path.lastIndexOf("/"));
+            }
             if (isResourcePath) {
                 String resourcePath = path.substring(pathIndex);
                 returnPath = returnPath.replace(RESOURCE_PATH, resourcePath);