diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 26148912b86..c5fc4ee7564 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -121,7 +121,7 @@
4.0.0
1.6.4
5.10.2
- 2.5.1.Final
+ 2.5.2.Final
2.0.7
2.0.6
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/BooleanEvalHelper.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/BooleanEvalHelper.java
index 9ebcb598d82..104002e898d 100644
--- a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/BooleanEvalHelper.java
+++ b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/util/BooleanEvalHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -205,15 +205,13 @@ public static boolean isEqualsStringCompare(Object value, Object itemFromList) {
* @return
*/
public static Boolean getBooleanOrDialectDefault(Object rawReturn, FEELDialect feelDialect) {
- if (feelDialect.equals(FEELDialect.BFEEL)) {
- if (rawReturn instanceof Boolean bool) {
- return bool;
- } else {
- return false;
- }
- } else {
- return (Boolean) rawReturn;
+ Boolean toReturn = null;
+ if (rawReturn instanceof Boolean bool) {
+ toReturn = bool;
+ } else if (feelDialect.equals(FEELDialect.BFEEL)) {
+ toReturn = false;
}
+ return toReturn;
}
/**
diff --git a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELTernaryLogicTest.java b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELTernaryLogicTest.java
index 42f779a768f..43a13c3a8c7 100644
--- a/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELTernaryLogicTest.java
+++ b/kie-dmn/kie-dmn-feel/src/test/java/org/kie/dmn/feel/runtime/FEELTernaryLogicTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -58,7 +58,12 @@ private static Collection