airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samin...@apache.org
Subject svn commit: r1389687 - in /airavata/trunk/modules: commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
Date Tue, 25 Sep 2012 02:40:06 GMT
Author: samindaw
Date: Tue Sep 25 02:40:06 2012
New Revision: 1389687

URL: http://svn.apache.org/viewvc?rev=1389687&view=rev
Log:
removing invalid experiment name update + null check for parameter data

Modified:
    airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java

Modified: airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java?rev=1389687&r1=1389686&r2=1389687&view=diff
==============================================================================
--- airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
(original)
+++ airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/WorkflowInstanceNodeData.java
Tue Sep 25 02:40:06 2012
@@ -54,11 +54,14 @@ public class WorkflowInstanceNodeData{
 	
 	private static List<NameValue> getIOParameterData(String data){
 		List<NameValue> parameters=new ArrayList<NameValue>();
-		String[] pairs = data.split(",");
-		for (String paras : pairs) {
-			String[] nameVals = paras.trim().split("=");
-			NameValue pair = new NameValue(nameVals[0].trim(),nameVals[1].trim());
-			parameters.add(pair);
+		if (data!=null) {
+			String[] pairs = data.split(",");
+			for (String paras : pairs) {
+				String[] nameVals = paras.trim().split("=");
+				NameValue pair = new NameValue(nameVals[0].trim(),
+						nameVals[1].trim());
+				parameters.add(pair);
+			}
 		}
 		return parameters;
 	}

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java?rev=1389687&r1=1389686&r2=1389687&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/provenance/WorkflowStatusUpdater.java
Tue Sep 25 02:40:06 2012
@@ -91,7 +91,6 @@ public class WorkflowStatusUpdater {
     public boolean saveWorkflowData(String experimentID,String workflowInstanceID,String
workflowTemplateID) {
         Timestamp currentTime = new Timestamp((new java.util.Date()).getTime());
         try {
-            registry.updateExperimentName(experimentID, workflowInstanceID);
             registry.setWorkflowInstanceTemplateName(workflowInstanceID, workflowTemplateID);
             registry.updateWorkflowInstanceStatus(new WorkflowInstanceStatus(new WorkflowInstance(experimentID,
workflowInstanceID), WorkflowInstanceStatus.ExecutionStatus.STARTED,currentTime));
         } catch (RegistryException e) {



Mime
View raw message