svn commit: r1079560 - /oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java

[bfoster]

Author: bfoster
Date: Tue Mar  8 21:48:36 2011
New Revision: 1079560

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

- improvements to ConnectWorkflowTaskInstance

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

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

Modified: 
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java?rev=1079560&r1=1079559&r2=1079560&view=diff
==============================================================================
--- 
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java
 (original)
+++ 
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/processor/WorkflowProcessor.java
 Tue Mar  8 21:48:36 2011
@@ -241,10 +241,12 @@ public abstract class WorkflowProcessor 
        public synchronized Metadata getPassThroughDynamicMetadata() {
                Metadata passThroughMet = new Metadata(this.dynamicMetadata);
                passThroughMet.removeMetadata(LOCAL_KEYS);
-               for (String key : 
this.dynamicMetadata.getAllMetadata(LOCAL_KEYS))
-                       passThroughMet.removeMetadata(key);
-               for (String key : 
this.staticMetadata.getAllMetadata(LOCAL_KEYS))
-                       passThroughMet.removeMetadata(key);
+               if (this.dynamicMetadata.getAllMetadata(LOCAL_KEYS) != null)
+                       for (String key : 
this.dynamicMetadata.getAllMetadata(LOCAL_KEYS))
+                               passThroughMet.removeMetadata(key);
+               if (this.staticMetadata.getAllMetadata(LOCAL_KEYS) != null)
+                       for (String key : 
this.staticMetadata.getAllMetadata(LOCAL_KEYS))
+                               passThroughMet.removeMetadata(key);
                return passThroughMet;
        }