Skip to content

Commit 28be7db

Browse files
committed
[bugfix] Exit on Java OutOfMemoryError
Closes eXist-db/exist#5439
1 parent 063a904 commit 28be7db

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

exist-core/src/main/java/org/exist/launcher/LauncherWrapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,8 @@ protected String getJavaCmd() {
201201
}
202202

203203
protected void getJavaOpts(final List<String> args, final Properties launcherProperties) {
204+
args.add("-XX:+ExitOnOutOfMemoryError");
205+
204206
getLauncherOpts(args, launcherProperties);
205207

206208
boolean foundExistHomeSysProp = false;

exist-core/src/main/java/org/exist/launcher/WindowsServiceManager.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ public void install() throws ServiceManagerException {
124124
final Optional<String> minMemory = asJavaCmdlineMemoryString(launcherProperties.getProperty(LAUNCHER_PROPERTY_MIN_MEM, "128"));
125125

126126
final StringBuilder jvmOptions = new StringBuilder();
127-
jvmOptions.append("-Dfile.encoding=UTF-8");
127+
jvmOptions.append("-XX:+ExitOnOutOfMemoryError");
128+
jvmOptions.append(";-Dfile.encoding=UTF-8");
128129
for (final String propertyName : System.getProperties().stringPropertyNames()) {
129130
if (propertyName.startsWith("exist.") ||
130131
propertyName.startsWith("jetty.") ||

exist-distribution/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,8 @@
886886
<extraArgument>-XX:+UseZGC</extraArgument>
887887
<extraArgument>-XX:+UseStringDeduplication</extraArgument>
888888

889+
<extraArgument>-XX:+ExitOnOutOfMemoryError</extraArgument>
890+
889891
<!-- Option to generate JDWP debuggable app -->
890892
<!-- extraArgument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</extraArgument -->
891893

0 commit comments

Comments
 (0)