added null-safety to TrackImpl.getValueSumRecursively

Change-Id: Ib0f8660c9e09c6cbd3a6cfb6937dbffde077fe5d
This commit is contained in:
Axel Uhl committed 2017-11-23 18:49:19 +01:00
1 parent 707d1cfeff
commit 970a755406
1 file changed
+6 -2
@@ -493,8 +493,12 @@ public class TrackImpl<FixType extends Timed> implements Track<FixType> {
valueFromEndOfCacheEntryToTo = getValueSumRecursively(bestCacheEntry.getA(), to,
recursionDepth + 1, nullElement, adder, cache, valueCalculator);
}
result = adder.add(adder.add(valueFromFromToBeginningOfCacheEntry, bestCacheEntry.getB().getB()),
valueFromEndOfCacheEntryToTo);
if (valueFromEndOfCacheEntryToTo == null || bestCacheEntry.getB().getB() == null) {
result = null;
} else {
result = adder.add(adder.add(valueFromFromToBeginningOfCacheEntry, bestCacheEntry.getB().getB()),
valueFromEndOfCacheEntryToTo);
}
} else {
if (from.compareTo(to) < 0) {
result = valueCalculator.calculate(from, to);