This is an automated email from the ASF dual-hosted git repository.
zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new de0b2335be [Fix-17848] Fix incorrect placement of JVM arguments in
java task (#17850)
de0b2335be is described below
commit de0b2335bece8f86917b7f96f273eed0b6ce34d3
Author: huangsheng <[email protected]>
AuthorDate: Tue Jan 6 15:18:23 2026 +0800
[Fix-17848] Fix incorrect placement of JVM arguments in java task (#17850)
---
.../org/apache/dolphinscheduler/plugin/task/java/JavaTask.java | 8 ++++----
.../apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java
index 5e958026ca..8ee2a341db 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java
@@ -136,11 +136,11 @@ public class JavaTask extends AbstractTask {
StringBuilder builder = new StringBuilder();
builder.append(getJavaCommandPath())
.append("java").append(Constants.SPACE)
+
.append(javaParameters.getJvmArgs().trim()).append(Constants.SPACE)
.append(buildResourcePath()).append(Constants.SPACE)
.append("-jar").append(Constants.SPACE)
.append(mainJarAbsolutePathInLocal).append(Constants.SPACE)
-
.append(javaParameters.getMainArgs().trim()).append(Constants.SPACE)
- .append(javaParameters.getJvmArgs().trim());
+ .append(javaParameters.getMainArgs().trim());
return builder.toString();
}
@@ -165,10 +165,10 @@ public class JavaTask extends AbstractTask {
StringBuilder builder = new StringBuilder();
builder.append(getJavaCommandPath())
.append("java").append(Constants.SPACE)
+
.append(javaParameters.getJvmArgs().trim()).append(Constants.SPACE)
.append(buildResourcePath()).append(Constants.SPACE)
.append(mainJarName).append(Constants.SPACE)
-
.append(javaParameters.getMainArgs().trim()).append(Constants.SPACE)
- .append(javaParameters.getJvmArgs().trim());
+ .append(javaParameters.getMainArgs().trim());
return builder.toString();
}
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java
index dd28b53857..4027cb7df9 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java
@@ -55,7 +55,7 @@ class JavaTaskTest {
JavaTask javaTask = runJarType();
assertThat(javaTask.buildJarCommand())
.isEqualTo(
- "${JAVA_HOME}/bin/java -classpath
.:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar
-jar /tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar -host
127.0.0.1 -port 8080 -xms:50m");
+ "${JAVA_HOME}/bin/java -xms:50m -classpath
.:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar
-jar /tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar -host
127.0.0.1 -port 8080");
}
/**
@@ -68,7 +68,7 @@ class JavaTaskTest {
JavaTask javaTask = runNormalJarType();
assertThat(javaTask.buildNormalJarCommand())
.isEqualTo(
- "${JAVA_HOME}/bin/java -classpath
.:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar:/tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar
Test -host 127.0.0.1 -port 8080 -xms:50m");
+ "${JAVA_HOME}/bin/java -xms:50m -classpath
.:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar:/tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar
Test -host 127.0.0.1 -port 8080");
}
/**