You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2012/07/26 10:43:15 UTC

svn commit: r1365912 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4Library.java

Author: gnodet
Date: Thu Jul 26 08:43:14 2012
New Revision: 1365912

URL: http://svn.apache.org/viewvc?rev=1365912&view=rev
Log:
[FELIX-3612] Fix native library loading problems on OS X

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4Library.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4Library.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4Library.java?rev=1365912&r1=1365911&r2=1365912&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4Library.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/R4Library.java Thu Jul 26 08:43:14 2012
@@ -106,6 +106,10 @@ public class R4Library
         {
             exts.add("dylib");
         }
+        if (libname.endsWith(".dylib") && m_libraryFile.endsWith(".jnilib"))
+        {
+            exts.add("jnilib");
+        }
         // Loop until we find a match or not.
         int extIdx = -1;
         while (!matched && (extIdx < exts.size()))