You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by bf...@apache.org on 2011/03/02 22:42:56 UTC

svn commit: r1076404 - /oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java

Author: bfoster
Date: Wed Mar  2 21:42:56 2011
New Revision: 1076404

URL: http://svn.apache.org/viewvc?rev=1076404&view=rev
Log:

- updates to WorkflowConnectionTaskInstance 

----------------------------

Modified:
    oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java

Modified: oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java
URL: http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java?rev=1076404&r1=1076403&r2=1076404&view=diff
==============================================================================
--- oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java (original)
+++ oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/instance/WorkflowConnectTaskInstance.java Wed Mar  2 21:42:56 2011
@@ -113,6 +113,7 @@ public class WorkflowConnectTaskInstance
 						return new ResultsFailureState("Failed to get metadata of spawned workflow [InstanceId='" + spawnedInstanceId + "']");
 					}
 				}
+				this.clearReserveKeys(dynMet);
 				ctrlMetadata.replaceLocalMetadata(dynMet);
 				List<String> keys = dynMet.getAllKeys();
 				ctrlMetadata.setAsWorkflowMetadataKey(keys.toArray(new String[keys.size()]));
@@ -123,6 +124,14 @@ public class WorkflowConnectTaskInstance
 		}
 	}
 	
+	private void clearReserveKeys(Metadata metadata) {
+		metadata.removeMetadata(N_CALCULATOR_CLASS);
+		metadata.removeMetadata(N_MET_MOD_CLASS);
+		metadata.removeMetadata(SPAWN_MODEL_ID);
+		metadata.removeMetadata(SPAWNED_WORKFLOWS);
+		metadata.removeMetadata(SPAWNED_BY_WORKFLOW);
+	}
+	
 	public interface NCalculator {
 		
 		public int determineN(ControlMetadata ctrlMetadata);