[izpack-changes] r1866 - izpack-src/trunk/src/lib/com/izforge/izpack/util

[noreply at berlios.de]

Author: vralev
Date: 2007-08-09 22:29:15 +0200 (Thu, 09 Aug 2007)
New Revision: 1866

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/util/Librarian.java
Log:
Load 64-bit lib if the 32-bit fails.

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/util/Librarian.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/util/Librarian.java	2007-08-09 20:24:04 UTC (rev 1865)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/util/Librarian.java	2007-08-09 20:29:15 UTC (rev 1866)
@@ -159,6 +159,17 @@
         return (me);
     }
 
+    public synchronized void loadLibrary(String name, NativeLibraryClient client) throws Exception
+    {
+       try
+       {
+          loadArchSpecificLibrary(name, client);
+       }
+       catch(Exception ex)
+       {
+          loadArchSpecificLibrary(name+"_x64", client);
+       }
+    }
     /*--------------------------------------------------------------------------*/
     /**
      * Loads the requested library. If the library is already loaded, this method returns
@@ -200,7 +211,7 @@
      * @exception Exception if all attempts to load the library fail.
      */
     /*--------------------------------------------------------------------------*/
-    public synchronized void loadLibrary(String name, NativeLibraryClient client) throws Exception
+    public synchronized void loadArchSpecificLibrary(String name, NativeLibraryClient client) throws Exception
     {
         String libraryName = strip(name);
         String tempFileName = "";