Improve reliability

goldmansachs · Sep 10, 2024 · 7f695fe · 7f695fe
1 parent 5c21278
commit 7f695fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/time/xml/DefaultDurationType.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/time/xml/DefaultDurationType.java
@@ -94,10 +94,16 @@ public Duration durationDivideNumber(Duration first, BigDecimal second) {
         if (isYearsAndMonthsDuration(first)) {
             Long firstValue = monthsValue(first);
             BigDecimal months = divideNumbers(firstValue, second);
+            if (months == null) {
+                throw new DMNRuntimeException(String.format("Cannot divide '%s' by '%s'", first, second));
+            }
             return XMLDurationFactory.INSTANCE.yearMonthFromValue(months.longValue());
         } else if (isDaysAndTimeDuration(first)) {
             Long firstValue = secondsValue(first);
             BigDecimal seconds = divideNumbers(firstValue, second);
+            if (seconds == null) {
+                throw new DMNRuntimeException(String.format("Cannot divide '%s' by '%s'", first, second));
+            }
             return XMLDurationFactory.INSTANCE.dayTimeFromValue(seconds.longValue());
         } else {
             throw new DMNRuntimeException(String.format("Cannot divide '%s' by '%s'", first, second));

diff --git a/dmn-runtime/src/main/java/com/gs/dmn/runtime/Context.java b/dmn-runtime/src/main/java/com/gs/dmn/runtime/Context.java
@@ -85,7 +85,7 @@ public String toString() {
         Set set = this.map.keySet();
         if (set != null && !set.isEmpty() && set.iterator().next() instanceof String) {
             ArrayList<String> orderedKeys = new ArrayList<>(set);
-            Collections.sort(orderedKeys, (s1, s2) -> s1 != null && s2 != null ? s1.compareTo(s1) : -1);
+            orderedKeys.sort((s1, s2) -> s1 != null && s2 != null ? s1.compareTo(s2) : -1);
             StringBuilder result = new StringBuilder("{");
             for(int i=0; i<orderedKeys.size(); i++) {
                 Object key = orderedKeys.get(i);