svn commit: r1076323 - in /oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow: engine/WorkflowEngineLocal.java instance/WorkflowConnectTaskInstance.java

[bfoster]

Author: bfoster
Date: Wed Mar  2 18:45:31 2011
New Revision: 1076323

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

- updates to engine runner submitter thread

- updates to WorkflowConnectTaskInstance (Object[] -> Sting[] cast exception)

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

Modified:
    
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
    
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/engine/WorkflowEngineLocal.java
URL: 
http://svn.apache.org/viewvc/oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java?rev=1076323&r1=1076322&r2=1076323&view=diff
==============================================================================
--- 
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
 (original)
+++ 
oodt/branches/wengine-branch/wengine/src/main/java/org/apache/oodt/cas/workflow/engine/WorkflowEngineLocal.java
 Wed Mar  2 18:45:31 2011
@@ -147,8 +147,10 @@ public class WorkflowEngineLocal impleme
                                                }
                                        }catch (Exception e) {
                                                LOG.log(Level.SEVERE, "Engine 
failed while submitting jobs to its runner : " + e.getMessage(), e);
-                                               if (nextTask != null)
+                                               if (nextTask != null) {
                                                        
WorkflowEngineLocal.this.queueManager.setState(nextTask.getInstanceId(), 
nextTask.getModelId(), new FailureState("Failed while submitting job to Runner 
: " + e.getMessage()));
+                                                       nextTask = null;
+                                               }
                                        }
                                        
                                        try {

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=1076323&r1=1076322&r2=1076323&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 18:45:31 2011
@@ -114,7 +114,8 @@ public class WorkflowConnectTaskInstance
                                        }
                                }
                                ctrlMetadata.replaceLocalMetadata(dynMet);
-                               
ctrlMetadata.setAsWorkflowMetadataKey((String[]) dynMet.getAllKeys().toArray());
+                               List<String> keys = dynMet.getAllKeys();
+                               
ctrlMetadata.setAsWorkflowMetadataKey(keys.toArray(new String[keys.size()]));
                                return new ResultsSuccessState("All spawned 
workflow completed successfully");
                        }else {
                                return new ResultsBailState("Waiting on " + 
(spawnedInstanceIds.size() - nDone) + " of " + spawnedInstanceIds.size() + " 
spawned workflows to finish");