svn commit: r1240666 - /oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java

[ma...@apache.org]

Author: mattmann
Date: Sun Feb  5 06:22:54 2012
New Revision: 1240666

URL: http://svn.apache.org/viewvc?rev=1240666&view=rev
Log:
- also needed as part of OODT-356

Modified:
    oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java

Modified: oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java
URL: http://svn.apache.org/viewvc/oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java?rev=1240666&r1=1240665&r2=1240666&view=diff
==============================================================================
--- oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java (original)
+++ oodt/trunk/workflow/src/main/java/org/apache/oodt/cas/workflow/instrepo/LuceneWorkflowInstanceRepository.java Sun Feb  5 06:22:54 2012
@@ -631,7 +631,8 @@ public class LuceneWorkflowInstanceRepos
                 .get("workflow_inst_currenttask_enddatetime"));
         inst.setStartDateTimeIsoStr(doc.get("workflow_inst_startdatetime"));
         inst.setEndDateTimeIsoStr(doc.get("workflow_inst_enddatetime"));
-        inst.setPriority(Priority.getPriority(Double.valueOf(doc.get("workflow_inst_priority"))));
+        inst.setPriority(Priority.getPriority(doc.get("workflow_inst_priority") != null ? 
+            Double.valueOf(doc.get("workflow_inst_priority")):Priority.getDefault().getValue()));
 
         // read the workflow instance metadata
         Metadata sharedContext = new Metadata();
@@ -737,8 +738,8 @@ public class LuceneWorkflowInstanceRepos
         if (condNames.length != condClasses.length
                 || condNames.length != condOrders.length
                 || condNames.length != condIds.length 
-                || condNames.length != condTimeouts.length
-                || condNames.length != condOptionals.length) {
+                || (condTimeouts != null && condNames.length != condTimeouts.length)
+                || (condOptionals != null && condNames.length != condOptionals.length)) {
             LOG.log(Level.WARNING,
                     "Condition arrays are not of same size when "
                             + "rebuilding from given Document");
@@ -751,8 +752,12 @@ public class LuceneWorkflowInstanceRepos
             cond.setConditionInstanceClassName(condClasses[i]);
             cond.setConditionName(condNames[i]);
             cond.setOrder(Integer.parseInt(condOrders[i]));
-            cond.setTimeoutSeconds(Long.parseLong(condTimeouts[i]));
-            cond.setOptional(Boolean.valueOf(condOptionals[i]));
+            if(condTimeouts != null){
+              cond.setTimeoutSeconds(Long.parseLong(condTimeouts[i]));
+            }
+            if(condOptionals != null){
+              cond.setOptional(Boolean.valueOf(condOptionals[i]));
+            }
         }
 
         return condList;