summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-11 09:16:20 +0200
committerNoel Grandin <noel@peralex.com>2014-08-13 10:24:10 +0200
commit77fb64eb36d4c1f82c3fee81b83bfe338e6cf1a0 (patch)
treedda0f9b839c36ed76aaf7c281680761f1bc7960d
parent34bcf9b498bccb5c924f4cec850ff15d88df6f07 (diff)
connectivity: remove pre-Java1.5 workaround
Change-Id: Ie35a308d012e75e3aa73dc81d06f0a39a881760b
-rw-r--r--connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
index 866f550f0a1b..c1d22a8f6633 100644
--- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
+++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
@@ -58,16 +58,7 @@ final class NativeLibraries {
URL url = ((URLClassLoader) cl).findResource(sysname);
if (url != null) {
try {
- System.load(
- File.class.getConstructor(
- new Class[] {
- ClassLoader.getSystemClassLoader().
- loadClass("java.net.URI") }).
- newInstance(
- new Object[] {
- URL.class.getMethod("toURI", new Class[0]).
- invoke(url, (java.lang.Object[])null) }).
- getAbsolutePath());
+ System.load(new File(url.toURI()).getAbsolutePath());
} catch (Throwable t) {
throw new UnsatisfiedLinkError(
e.toString()+ " - " + t.toString());