You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/01/25 23:43:18 UTC
svn commit: r1235974 -
/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/impl/AiravataJCRRegistry.java
Author: samindaw
Date: Wed Jan 25 22:43:17 2012
New Revision: 1235974
URL: http://svn.apache.org/viewvc?rev=1235974&view=rev
Log:
jcr node property checks + typo on returning null fix
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=1235974&r1=1235973&r2=1235974&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 Wed Jan 25 22:43:17 2012
@@ -861,24 +861,34 @@ public class AiravataJCRRegistry extends
NodeIterator workflowNodes = experimentNode.getNodes();
for (; workflowNodes.hasNext();) {
Node workflowNode = workflowNodes.nextNode();
- String workflowName = workflowNode.getProperty(PROPERTY_WORKFLOW_NAME).getString();
- if (workflowNameRegEx != null && !workflowName.matches(workflowNameRegEx)) {
- continue;
- }
- NodeIterator serviceNodes = workflowNode.getNodes();
+ String workflowName = null;
+ if (workflowNode.hasProperty(PROPERTY_WORKFLOW_NAME)) {
+ workflowName = workflowNode.getProperty(
+ PROPERTY_WORKFLOW_NAME).getString();
+ if (workflowNameRegEx != null
+ && !workflowName.matches(workflowNameRegEx)) {
+ continue;
+ }
+ }
+ NodeIterator serviceNodes = workflowNode.getNodes();
for (; serviceNodes.hasNext();) {
Node serviceNode = serviceNodes.nextNode();
if (nodeNameRegEx != null && !serviceNode.getName().matches(nodeNameRegEx)) {
continue;
}
Node ioNode = getOrAddNode(serviceNode, type);
- WorkflowServiceIOData workflowIOData = new WorkflowServiceIOData();
- workflowIOData.setExperimentId(experimentNode.getName());
- workflowIOData.setWorkflowId(workflowNode.getName());
- workflowIOData.setWorkflowName(workflowName);
- workflowIOData.setNodeId(serviceNode.getName());
- workflowIOData.setValue(ioNode.getProperty(PROPERTY_WORKFLOW_IO_CONTENT).getString());
- workflowIODataList.add(workflowIOData);
+ if (ioNode.hasProperty(PROPERTY_WORKFLOW_IO_CONTENT)) {
+ WorkflowServiceIOData workflowIOData = new WorkflowServiceIOData();
+ workflowIOData.setExperimentId(experimentNode
+ .getName());
+ workflowIOData
+ .setWorkflowId(workflowNode.getName());
+ workflowIOData.setWorkflowName(workflowName);
+ workflowIOData.setNodeId(serviceNode.getName());
+ workflowIOData.setValue(ioNode.getProperty(
+ PROPERTY_WORKFLOW_IO_CONTENT).getString());
+ workflowIODataList.add(workflowIOData);
+ }
}
}
}
@@ -1146,7 +1156,7 @@ public class AiravataJCRRegistry extends
workflowExecution.setOutput(getWorkflowExecutionOutput(experimentId));
workflowExecution.setServiceInput(searchWorkflowExecutionServiceInput(experimentId,".*",".*"));
workflowExecution.setServiceOutput(searchWorkflowExecutionServiceOutput(experimentId,".*",".*"));
- return null;
+ return workflowExecution;
}
public List<WorkflowIOData> getWorkflowExecutionOutput(String experimentId)