From 694a0068763cf44eabe6b8fba7816a1a7e8698ca Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Aug 05 2016 14:11:00 +0000
Subject: Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME}


---

diff --git a/tomcat-7.0.conf b/tomcat-7.0.conf
index a500479..327cdd9 100644
--- a/tomcat-7.0.conf
+++ b/tomcat-7.0.conf
@@ -8,6 +8,9 @@
 # (see, for instance, /etc/sysconfig/tomcat)
 #
 
+# This variable is used to figure out if config is loaded or not.
+TOMCAT_CFG_LOADED="1"
+
 # Where your java installation lives
 JAVA_HOME="/usr/lib/jvm/jre"
 
diff --git a/tomcat-7.0.wrapper b/tomcat-7.0.wrapper
index d6db6e8..61b25c3 100644
--- a/tomcat-7.0.wrapper
+++ b/tomcat-7.0.wrapper
@@ -8,12 +8,15 @@ else
 fi
 
 # Get the tomcat config (use this for environment specific settings)
-if [ -z "${TOMCAT_CFG}" ]; then
-  TOMCAT_CFG="/etc/tomcat/tomcat.conf"
-fi
+# if $TOMCAT_CFG wasn't already loaded
+if [ -z "${TOMCAT_CFG_LOADED}" ]; then
+    if [ -z "${TOMCAT_CFG}" ]; then
+      TOMCAT_CFG="/etc/tomcat/tomcat.conf"
+    fi
 
-if [ -r "$TOMCAT_CFG" ]; then
-  . $TOMCAT_CFG
+    if [ -r "$TOMCAT_CFG" ]; then
+      . $TOMCAT_CFG
+    fi
 fi
 
 set_javacmd
diff --git a/tomcat.spec b/tomcat.spec
index a55bd56..723ab0c 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -643,6 +643,7 @@ fi
 - Resolves: rhbz#1314177 Tomcat init script reports wrong status when one instance of several is stopped
 - Resolves: rhbz#1312280 Unable to overwrite the TOMCAT_SCRIPT variable
 - Resolves: rhbz#1104708 Tomcat init script does not respect setting of CATALINA_PID in /etc/sysconfig/tomcat
+- Resolves: rhbz#1104704 /usr/sbin/tomcat overrides settings specified in /etc/sysconfig/${NAME}
 
 * Fri Nov 13 2015 Coty Sutherland <csutherl@redhat.com> 0:7.0.65-1
 - Updated to 7.0.65