Author: mturk
Date: Wed Mar 6 10:34:31 2013
New Revision: 1453272
URL: http://svn.apache.org/r1453272
Log:
Fix DAEMON-281
Modified:
commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt
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=1453272&r1=1453271&r2=1453272&view=diff
==============================================================================
--- commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt (original)
+++ commons/proper/daemon/branches/1.0.x/RELEASE-NOTES.txt Wed Mar 6 10:34:31
2013
@@ -84,7 +84,7 @@ NEW FEATURES:
BUG FIXES:
-1.0.14: DAEMON-283
+1.0.14: DAEMON-281, DAEMON-283
1.0.13: DAEMON-275, DAEMON-276
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=1453272&r1=1453271&r2=1453272&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 Wed
Mar 6 10:34:31 2013
@@ -84,6 +84,8 @@ char *location_jvm_cfg[] = {
char *location_jvm_default[] = {
#if defined(OS_DARWIN)
"$JAVA_HOME/../Libraries/libjvm.dylib",
+ "$JAVA_HOME/jre/lib/server/libjvm.dylib",
+ "$JAVA_HOME/jre/lib/client/libjvm.dylib",
#elif defined(OS_CYGWIN)
"$JAVA_HOME/jre/bin/classic/jvm.dll", /* Sun JDK 1.3 */
"$JAVA_HOME/jre/bin/client/jvm.dll", /* Sun JDK 1.4 */
