You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/04/17 21:17:38 UTC
svn commit: r1327230 -
/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
Author: lahiru
Date: Tue Apr 17 19:17:38 2012
New Revision: 1327230
URL: http://svn.apache.org/viewvc?rev=1327230&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-368.
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java?rev=1327230&r1=1327229&r2=1327230&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java Tue Apr 17 19:17:38 2012
@@ -310,7 +310,6 @@ public class AiravataJCRRegistry extends
Node appName = getOrAddNode(hostNode, app.getType().getApplicationName().getStringValue());
appName.setProperty(XML_PROPERTY_NAME, app.toXML());
session.save();
-
result = appName.getIdentifier();
// triggerObservers(this);
} catch (Exception e) {
@@ -436,20 +435,8 @@ public class AiravataJCRRegistry extends
Node deploymentNode = getDeploymentNode(session);
Node serviceNode = deploymentNode.getNode(serviceName);
Node hostNode = serviceNode.getNode(hostName);
- boolean found = false;
- List<Node> childNodes = getChildNodes(hostNode);
- for (Node app:childNodes) {
- Property prop = app.getProperty(XML_PROPERTY_NAME);
- ApplicationDeploymentDescription appDesc = ApplicationDeploymentDescription.fromXML(prop.getString());
- if (appDesc.getType().getApplicationName().getStringValue().matches(applicationName)) {
- app.remove();
- found = true;
- }
- }
- if (found) {
- session.save();
-// triggerObservers(this);
- }
+ hostNode.remove();
+ session.save();
} catch (Exception e) {
throw new DeploymentDescriptionRetrieveException(e);
} finally {