modules/enterprise/agent/src/etc/rhq-agent.sh | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit e0ff57671c03264969d0870a6ba67efb41f8f218
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Mon Jun 24 17:44:33 2013 +0200
Bug 819116 - Attach API only works with RHQ_AGENT_JAVA_HOME
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh
b/modules/enterprise/agent/src/etc/rhq-agent.sh
index 9e8de03..be30134 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -126,6 +126,12 @@ if [ -z "$RHQ_AGENT_JAVA_EXE_FILE_PATH" ]; then
fi
debug_msg "RHQ_AGENT_JAVA_HOME: $RHQ_AGENT_JAVA_HOME"
RHQ_AGENT_JAVA_EXE_FILE_PATH="${RHQ_AGENT_JAVA_HOME}/bin/java"
+else
+ # Infer RHQ_AGENT_JAVA_HOME from RHQ_AGENT_JAVA_EXE_FILE_PATH
+ # RHQ_AGENT_JAVA_HOME will be used later to find JDK's tools.jar if available
+ _RHQ_AGENT_JAVA_BIN_DIR=`dirname "$RHQ_AGENT_JAVA_EXE_FILE_PATH"`
+ RHQ_AGENT_JAVA_HOME=`dirname "$_RHQ_AGENT_JAVA_BIN_DIR"`
+ debug_msg "RHQ_AGENT_JAVA_HOME (inferred from RHQ_AGENT_JAVA_EXE_FILE_PATH):
$RHQ_AGENT_JAVA_HOME"
fi
debug_msg "RHQ_AGENT_JAVA_EXE_FILE_PATH: $RHQ_AGENT_JAVA_EXE_FILE_PATH"
Show replies by date