More java.lang.System.mapLibraryName dylib vs. jnilib confusion

...like a76261ac9e40eb57e942db2c7aea8b8a5e904ff2

Change-Id: I803dc81344efb5e8021d9ef4146c06ecf82ca63b

1 files changed, 9 insertions, 0 deletions

diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java b/bean/com/sun/star/beans/LocalOfficeConnection.java
index dd2ed076ae9d..d8e7b3baa654 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -78,6 +78,15 @@ public class LocalOfficeConnection
         // load libofficebean.so/officebean.dll
         String aSharedLibName = getProgramPath() + java.io.File.separator +
             System.mapLibraryName(OFFICE_LIB_NAME);
+        // At least Oracle's 1.7.0_51 now maps to .dylib rather than .jnilib:
+        if (System.getProperty("os.name").startsWith("Mac")
+            && aSharedLibName.endsWith(".dylib"))
+        {
+            aSharedLibName
+                = aSharedLibName.substring(
+                    0, aSharedLibName.length() - "dylib".length())
+                + "jnilib";
+        }
         System.load( aSharedLibName );
     }