Merge branch '1.1.x'

Author: CodeCasterX

app-builder/waterflow/java/waterflow-service/src/main/java/modelengine/fit/waterflow/flowsengine/domain/flows/definitions/nodes/FlowNode.java

@@ -60,6 +60,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -362,16 +363,12 @@ private FlowErrorInfo getErrorInfo(Exception ex) {
     }
 
     private void setJoberErrorInfo(FlowErrorInfo errorInfo, WaterflowException jobberException) {
-        if (!(jobberException.getCause() instanceof FitException)) {
+        if (!(jobberException.getCause() instanceof FitException originalException)) {
             setErrorInfo(errorInfo, FLOW_SYSTEM_ERROR.getErrorCode(), jobberException.getCause().getMessage(),
                     new String[0]);
             return;
         }
-        FitException originalException = (FitException) jobberException.getCause();
-        String message = originalException.getMessage();
-        if (StringUtils.isBlank(message)) {
-            message = originalException.getCause().getMessage();
-        }
+        String message = this.getActualMessage(originalException);
         setErrorInfo(errorInfo, originalException.getCode(), message, new String[0]);
         errorInfo.setProperties(new HashMap<>());
         errorInfo.getProperties().put("fitableId", originalException.getProperties().get("fitableId"));
@@ -539,4 +536,17 @@ public FlowEnv(FlowContextRepo<FlowData> repo, FlowContextMessenger messenger, F
             this.locks = locks;
         }
     }
+
+    private String getActualMessage(Throwable throwable) {
+        Set<Throwable> visited = new HashSet<>();
+        while (throwable != null && !visited.contains(throwable)) {
+            visited.add(throwable);
+            String message = throwable.getMessage();
+            if (StringUtils.isNotBlank(message)) {
+                return message;
+            }
+            throwable = throwable.getCause();
+        }
+        return null;
+    }
 }