Author: keith
Date: Sun Jun  1 23:10:35 2008
New Revision: 17747
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17747

Log:
Fixing Mashup-827


Modified:
   
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java

Modified: 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java?rev=17747&r1=17746&r2=17747&view=diff
==============================================================================
--- 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   (original)
+++ 
trunk/mashup/java/modules/javascriptdeployer/src/org/wso2/mashup/deployer/JSDeployer.java
   Sun Jun  1 23:10:35 2008
@@ -300,7 +300,14 @@
                             (EmbeddedRegistry) 
configCtx.getAxisConfiguration().getParameterValue(
                                     RegistryConstants.REGISTRY);
                     UserRegistry systemRegistry = 
embeddedRegistry.getSystemRegistry();
-                    systemRegistry.delete((String) myRegistryPath.getValue());
+                    String path = (String) myRegistryPath.getValue();
+
+                    // If the user deleted the Mashup from the UI then we 
delete the resource in the
+                    // admin Service itself. Cause the UI is driven from the 
registry. So before
+                    // deleting we have to check for its existance
+                    if (systemRegistry.resourceExists(path)) {
+                        systemRegistry.delete(path);
+                    }
                 }
 
                 // If a mashup had specified a function to be called on 
undeployment

_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to