Fix upgrade issue with description null values

[#383]
rundeck · Sep 23, 2011 · 60f1a81 · 60f1a81
1 parent 39f94a7
commit 60f1a81
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -798,7 +798,12 @@ class ScheduledExecutionController  {
             changeinfo.extraInfo = " (internalID:${scheduledExecution.id})"
         }
         scheduledExecution.properties = nonopts
-
+
+        //fix potential null/blank issue after upgrading rundeck to 1.3.1/1.4
+        if (!scheduledExecution.description) {
+            scheduledExecution.description = ''
+        }
+
         final Map oldopts = params.findAll{it.key=~/^(name|command|type|adhocExecution|adhocFilepath|adhoc.*String)$/}
         if(oldopts && !params.workflow){
             //construct workflow with one item from these options
@@ -1134,6 +1139,12 @@ class ScheduledExecutionController  {
         scheduledExecution.clearFilterFields()
         scheduledExecution.properties = newprops
 
+        //fix potential null/blank issue after upgrading rundeck to 1.3.1/1.4
+        if (!scheduledExecution.description) {
+            scheduledExecution.description = ''
+        }
+
+
         //clear old mode job properties
         scheduledExecution.adhocExecution=false;
         scheduledExecution.adhocRemoteString=null
@@ -1666,6 +1677,12 @@ class ScheduledExecutionController  {
         final Map nonopts = params.findAll {!it.key.startsWith("option.") && it.key != 'workflow'&& it.key != 'options'&& it.key != 'notifications'}
         final Map oldopts = params.findAll{it.key=~/^(name|command|type|adhocExecution|adhocFilepath|adhoc.*String)$/}
         scheduledExecution.properties = nonopts
+
+        //fix potential null/blank issue after upgrading rundeck to 1.3.1/1.4
+        if(!scheduledExecution.description){
+            scheduledExecution.description=''
+        }
+
         if(oldopts && !params.workflow){
             //construct workflow with one item from these options
             oldopts.project=scheduledExecution.project