Author: mturk Date: Fri Oct 18 07:40:05 2013 New Revision: 1533348 URL: http://svn.apache.org/r1533348 Log: Apply fix for DAEMON-281
Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c Modified: commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt?rev=1533348&r1=1533347&r2=1533348&view=diff ============================================================================== --- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original) +++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Fri Oct 18 07:40:05 2013 @@ -84,7 +84,7 @@ NEW FEATURES: BUG FIXES: -1.0.16: DAEMON-289, DAEMON-308 +1.0.16: DAEMON-281, DAEMON-289, DAEMON-308 1.0.15: DAEMON-288, DAEMON-291, DAEMON-292 Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c?rev=1533348&r1=1533347&r2=1533348&view=diff ============================================================================== --- commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c (original) +++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/java.c Fri Oct 18 07:40:05 2013 @@ -203,6 +203,13 @@ bool java_init(arg_data *args, home_data return false; } } + if (stat(appf, &sb)) { + if (replace(appf, 1024, "$JAVA_HOME/../MacOS/libjli.dylib", + "$JAVA_HOME", data->path) != 0) { + log_error("Cannot replace values in loader library"); + return false; + } + } apph = dso_link(appf); if (apph == NULL) { log_error("Cannot load required shell library %s", appf); Modified: commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c URL: http://svn.apache.org/viewvc/commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c?rev=1533348&r1=1533347&r2=1533348&view=diff ============================================================================== --- commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c (original) +++ commons/proper/daemon/branches/1.0.x/src/native/unix/native/location.c Fri Oct 18 07:40:05 2013 @@ -143,6 +143,7 @@ char *location_jvm_default[] = { */ char *location_jvm_configured[] = { #if defined(OS_DARWIN) + "$JAVA_HOME/jre/lib/$VM_NAME/libjvm.dylib", "$JAVA_HOME/../Libraries/lib$VM_NAME.dylib", #elif defined(OS_CYGWIN) "$JAVA_HOME/jre/bin/$VM_NAME/jvm.dll", /* Sun JDK 1.3 */