Fixed deep copy for infinite Periodic Jobs

vangav · Sep 7, 2017 · a8234f9 · a8234f9
1 parent 7fa2af6
commit a8234f9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/dist/vos_backend.jar b/dist/vos_backend.jar
diff --git a/src/com/vangav/backend/thread_pool/periodic_jobs/CycleTicker.java b/src/com/vangav/backend/thread_pool/periodic_jobs/CycleTicker.java
@@ -109,7 +109,14 @@ public CycleTicker (CycleTicker cycleTicker) throws Exception {
 
     this.initialCycle = cycleTicker.initialCycle;
     this.cycleStep = cycleTicker.cycleStep;
-    this.runFor = new Period(cycleTicker.runFor);
+
+    if (cycleTicker.runFor == null) {
+
+      this.runFor = null;
+    } else {
+
+      this.runFor = new Period(cycleTicker.runFor);
+    }
   }
 
   /**

diff --git a/src/com/vangav/backend/thread_pool/periodic_jobs/PeriodicJob.java b/src/com/vangav/backend/thread_pool/periodic_jobs/PeriodicJob.java
@@ -433,8 +433,16 @@ final protected synchronized PeriodicJob<T> getNextPeriodicJob (
       (Calendar)this.startCalendar.clone();
     getNextPeriodicJob.startTime =
       this.startTime;
-    getNextPeriodicJob.endCalendar =
-      (Calendar)this.endCalendar.clone();
+
+    if (this.endCalendar == null) {
+
+      getNextPeriodicJob.endCalendar = null;
+    } else {
+
+      getNextPeriodicJob.endCalendar =
+        (Calendar)this.endCalendar.clone();
+    }
+
     getNextPeriodicJob.endTime =
       this.endTime;
     getNextPeriodicJob.execPeriod =