ooo-build r14190 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Thu Oct  2 15:52:40 2008
New Revision: 14190
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14190&view=rev

Log:
2008-10-02  Petr Mladek  <pmladek suse cz>

	* patches/dev300/connectivity-load-libhsqldb-with-jre-1.4.diff:
	* patches/dev300/apply: another fallback to load libhsqldb with
	  JRE 1.4 (bnc#431360)



Added:
   trunk/patches/dev300/connectivity-load-libhsqldb-with-jre-1.4.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Oct  2 15:52:40 2008
@@ -1086,6 +1086,8 @@
 build-java-1.4-enable.diff, i#12345, pmladek
 # disable optional @Override; can't go upstream
 build-java-1.4-filter.diff, i#12345, pmladek
+# another fallback to load libhsqldb with JRE 1.4
+connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml

Added: trunk/patches/dev300/connectivity-load-libhsqldb-with-jre-1.4.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/connectivity-load-libhsqldb-with-jre-1.4.diff	Thu Oct  2 15:52:40 2008
@@ -0,0 +1,18 @@
+--- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java.old	2008-04-10 09:28:04.000000000 +0200
++++ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java	2008-10-02 16:43:19.000000000 +0200
+@@ -71,8 +71,13 @@ final class NativeLibraries {
+                                      invoke(url, null) })).
+                             getAbsolutePath());
+                     } catch (Throwable t) {
+-                        throw new UnsatisfiedLinkError(
+-                            e.toString()+ " - " + t.toString());
++			// final fallback for Java 1.4.2
++			try {
++                            System.load(url.getPath());
++			} catch (Throwable t2) {
++                            throw new UnsatisfiedLinkError(
++                            e.toString()+ " - " + t2.toString());
++			}
+                     }
+                 }
+             }