Skip to content

Commit

Permalink
Merge branch 'master' into noReconnectAfter
Browse files Browse the repository at this point in the history
  • Loading branch information
Vlatombe authored May 15, 2024
2 parents a3004af + 19e2927 commit 623bc8c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
1 change: 1 addition & 0 deletions .mvn/jvm.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Xmx256m -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ THE SOFTWARE.
<spotbugs.effort>Max</spotbugs.effort>
<spotbugs.threshold>Low</spotbugs.threshold>
<bc-version>1.78.1</bc-version>
<argLine>-Xms256M -Xmx256M -XX:+TieredCompilation -XX:TieredStopAtLevel=1</argLine>
</properties>

<dependencies>
Expand Down
9 changes: 2 additions & 7 deletions src/test/java/hudson/remoting/ForkRunner.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ protected List<String> buildCommandLine() {
String cp = getClasspath();

List<String> r = new ArrayList<>();
r.add("-Xmx128M");
r.add("-cp");
r.add(cp);
r.add(Launcher.class.getName());
Expand Down Expand Up @@ -61,13 +62,7 @@ public String getName() {
}

public String getClasspath() {
// this assumes we run in Maven
StringBuilder buf = new StringBuilder();
for (String entry : System.getProperty("java.class.path").split(":")) {
if (buf.length()>0) buf.append(File.pathSeparatorChar);
buf.append(entry);
}
return buf.toString();
return System.getProperty("java.class.path");
}

@Override
Expand Down

0 comments on commit 623bc8c

Please sign in to comment.