From 7cbe23974c729a538fd3971ee0de344f526bfee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Mon, 1 Apr 2024 11:28:21 +0200
Subject: [PATCH] Revert "AMQ-9460: Don't override ACTIVEMQ_OPTS when provided
 by user"

---
 assembly/src/docker/Dockerfile    | 2 +-
 assembly/src/release/bin/activemq | 7 +++++++
 assembly/src/release/bin/setenv   | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/assembly/src/docker/Dockerfile b/assembly/src/docker/Dockerfile
index 596265c5e2..819b64c111 100644
--- a/assembly/src/docker/Dockerfile
+++ b/assembly/src/docker/Dockerfile
@@ -24,7 +24,7 @@ ENV ACTIVEMQ_HOME $ACTIVEMQ_INSTALL_PATH/apache-activemq
 ENV ACTIVEMQ_EXEC exec
 ENV PATH $PATH:$ACTIVEMQ_HOME/bin
 # Make the Web console accesible from outside the container
-ENV ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
+ENV ACTIVEMQ_OPTS $ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
 #WORKDIR $ACTIVEMQ_HOME
 
 # activemq_dist can point to a directory or a tarball on the local system
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 720cd0e586..8a51f40475 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -198,6 +198,13 @@ if [ "$CONFIG_LOAD" != "yes" ];then
       echo
 fi
 
+if [ -z "$ACTIVEMQ_OPTS" ] ; then
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=\"$ACTIVEMQ_CONF\"/login.config"
+fi
+
+
+
+
 # ------------------------------------------------------------------------
 # OS SPECIFIC SUPPORT
 
diff --git a/assembly/src/release/bin/setenv b/assembly/src/release/bin/setenv
index 17e927f94a..87c2624993 100644
--- a/assembly/src/release/bin/setenv
+++ b/assembly/src/release/bin/setenv
@@ -33,7 +33,9 @@
 if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
     ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
 fi
-ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY $ACTIVEMQ_OPTS -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
+if [ -z "$ACTIVEMQ_OPTS" ] ; then
+    ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
+fi
 
 if [ -z "$ACTIVEMQ_OUT" ]; then
    ACTIVEMQ_OUT="/dev/null"