Revert "Avoid ExitOnOutOfMemoryError"

1 files changed, 1 insertions, 7 deletions

diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index 84ce53e0ccf..f9eddafbfbb 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -151,19 +151,13 @@ StartCommand() {
     printenv > "$cfpfile"
     FixDataDirectory "$bundlecachedir"
 
-    # TODO: Change
-    #   -XX:OnOutOfMemoryError='kill -9 %p'
-    # to
-    #   -XX:+ExitOutOfMemoryError
-    # below once java version is guaranteed to be >= 8 u92
-
     java \
 	"${jvm_arguments[@]}" \
         -Xms128m -Xmx2048m \
         -XX:+PreserveFramePointer \
         -XX:+HeapDumpOnOutOfMemoryError \
         -XX:HeapDumpPath="$VESPA_HOME/var/crash" \
-        -XX:OnOutOfMemoryError='kill -9 %p' \
+        -XX:+ExitOnOutOfMemoryError \
         -Djava.library.path="$VESPA_HOME/lib64" \
         -Djava.awt.headless=true \
 	-Dsun.rmi.dgc.client.gcInterval=3600000 \