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 5e958026ca8e..8ee2a341db25 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 @@ protected String buildJarCommand() { 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 @@ protected String buildNormalJarCommand() { 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 dd28b53857d4..4027cb7df9ca 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 @@ void buildJarCommand() { 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 @@ void buildNormalJarCommand() { 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"); } /**