Merge pull request #305 from doublep/master

Fix potential NPE in TaskSeriesCollection
jfree · Jan 8, 2023 · e2d6788 · e2d6788
2 parents b62b85d + c77fcec
commit e2d6788
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jfree/data/gantt/TaskSeriesCollection.java b/src/main/java/org/jfree/data/gantt/TaskSeriesCollection.java
@@ -520,7 +520,9 @@ public Number getStartValue(R rowKey, C columnKey, int subinterval) {
             Task sub = task.getSubtask(subinterval);
             if (sub != null) {
                 TimePeriod duration = sub.getDuration();
-                result = duration.getStart().getTime();
+                if (duration != null) {
+                    result = duration.getStart().getTime();
+                }
             }
         }
         return result;
@@ -561,7 +563,9 @@ public Number getEndValue(R rowKey, C columnKey, int subinterval) {
             Task sub = task.getSubtask(subinterval);
             if (sub != null) {
                 TimePeriod duration = sub.getDuration();
-                result = duration.getEnd().getTime();
+                if (duration != null) {
+                    result = duration.getEnd().getTime();
+                }
             }
         }
         return result;