[Fix #3460] Fix ClassCastException on Exception mapping (#3461)

* [Fix #3460] Fix ClassCastException on Exception mapping * Revert "[Fix #3460] Fix ClassCastException on Exception mapping" This reverts commit 6f729ff. * [Fix #3460] Conservative approach
apache · Apr 5, 2024 · 19e3630 · 19e3630
1 parent 73b0e84
commit 19e3630
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/...ption-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionsHandler.java b/...ption-handler/src/main/java/org/kie/kogito/resource/exceptions/BaseExceptionsHandler.java
@@ -176,16 +176,13 @@ private <R> Function<R, T> fromErrorCode(String errorCode) {
     public <R extends Exception, U> T mapException(R exception) {
         FunctionHolder<T, U> holder = (FunctionHolder<T, U>) mapper.getOrDefault(exception.getClass(), defaultHolder);
         U body = holder.getContentGenerator().apply(exception);
-        if (exception instanceof ProcessInstanceExecutionException || exception instanceof WorkItemExecutionException) {
-            Throwable rootCause = exception.getCause();
-
-            while (rootCause != null) {
-                if (mapper.containsKey(rootCause.getClass())) {
-                    holder = (FunctionHolder<T, U>) mapper.get(rootCause.getClass());
-                    break;
-                }
-                rootCause = rootCause.getCause();
+        Throwable rootCause = exception.getCause();
+        while (rootCause != null) {
+            if (mapper.containsKey(rootCause.getClass())) {
+                holder = (FunctionHolder<T, U>) mapper.get(rootCause.getClass());
+                exception = (R) rootCause;
             }
+            rootCause = rootCause.getCause();
         }
         return holder.getResponseGenerator().apply(exception).apply(body);
     }

diff --git a/...g/kie/kogito/addons/quarkus/knative/serving/customfunctions/it/KnativeServingAddonIT.java b/...g/kie/kogito/addons/quarkus/knative/serving/customfunctions/it/KnativeServingAddonIT.java
@@ -264,7 +264,7 @@ void execute404() {
                 .accept(ContentType.JSON).when()
                 .post("/serviceNotFound")
                 .then()
-                .statusCode(HttpURLConnection.HTTP_INTERNAL_ERROR);
+                .statusCode(HttpURLConnection.HTTP_NOT_FOUND);
     }
 
     @Test