This is an automated email from the ASF dual-hosted git repository.
funky-eyes pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new 08d08effff bugfix: fix Groovy dependency conflict causing saga test
failure (#8134)
08d08effff is described below
commit 08d08effff90f10c7ae89f0f9ffe9007fa588ead
Author: lokidundun <[email protected]>
AuthorDate: Tue Jun 9 09:08:44 2026 +0800
bugfix: fix Groovy dependency conflict causing saga test failure (#8134)
---
dependencies/pom.xml | 4 ++++
.../seata/saga/engine/pcext/handlers/ScriptTaskStateHandler.java | 8 ++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 23a312cbe3..20df1aa86d 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -212,6 +212,10 @@
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-el</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
</exclusions>
<type>pom</type>
<scope>import</scope>
diff --git
a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/ScriptTaskStateHandler.java
b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/ScriptTaskStateHandler.java
index 0707332a7a..eacb99f95a 100644
---
a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/ScriptTaskStateHandler.java
+++
b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/ScriptTaskStateHandler.java
@@ -147,9 +147,13 @@ public class ScriptTaskStateHandler implements
StateHandler, InterceptableStateH
scriptType,
e);
- ((HierarchicalProcessContext)
context).setVariableLocally(DomainConstants.VAR_NAME_CURRENT_EXCEPTION, e);
+ Exception exceptionToStore = (e instanceof Exception)
+ ? (Exception) e
+ : new RuntimeException("Script execution failed: " +
e.getMessage(), e);
+ ((HierarchicalProcessContext) context)
+
.setVariableLocally(DomainConstants.VAR_NAME_CURRENT_EXCEPTION,
exceptionToStore);
- EngineUtils.handleException(context, state, e);
+ EngineUtils.handleException(context, state, exceptionToStore);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
