Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand All @@ -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();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

/**
Expand All @@ -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");
}

/**
Expand Down
Loading