[commons-daemon] branch master updated: Fix DAEMON-410. jsvc libjvm.so search path

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git


The following commit(s) were added to refs/heads/master by this push:
     new b57b73a  Fix DAEMON-410. jsvc libjvm.so search path
b57b73a is described below

commit b57b73af16be56f205e23090259bdf895e57e335
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Nov 22 13:28:38 2019 +0000

    Fix DAEMON-410. jsvc libjvm.so search path
    
    jsvc. Update the list of paths searched for libjvm.so to include the
    path used by OpenJDK 11.
    
    Patch provided by Richard Morrell
---
 src/changes/changes.xml           | 4 ++++
 src/native/unix/native/location.c | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index c0d2c53..1a6f3f7 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -49,6 +49,10 @@
         enabled if requested and correctly save the setting if it is enabled in
         the GUI. 
       </action>
+      <action issue="DAEMON-410" type="fix" dev="markt" due-to="Richard 
Morrell">
+        jsvc. Update the list of paths searched for libjvm.so to include the
+        path used by OpenJDK 11.
+      </action>
     </release>
     <release version="1.2.2" date="2019-10-04" description="Bug fix release">
       <action issue="DAEMON-408" type="fix" dev="markt">
diff --git a/src/native/unix/native/location.c 
b/src/native/unix/native/location.c
index dd5d4ab..c3c8117 100644
--- a/src/native/unix/native/location.c
+++ b/src/native/unix/native/location.c
@@ -117,6 +117,7 @@ char *location_jvm_default[] = {
     "$JAVA_HOME/jre/lib/client/libjvm.so",
     "$JAVA_HOME/jre/lib/libjvm.so",
     "$JAVA_HOME/lib/classic/libjvm.so",
+    "$JAVA_HOME/lib/server/libjvm.so",
     "$JAVA_HOME/lib/client/libjvm.so",
     "$JAVA_HOME/lib/libjvm.so",
     "$JAVA_HOME/jre/bin/classic/libjvm.so",