diff options
| author | Andrew Niefer | 2007-07-18 20:48:56 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2007-07-18 20:48:56 +0000 |
| commit | b00d09549b8e353c828f0e71936343f2e857cf26 (patch) | |
| tree | f62d58ae724c8e6acae36ef1735967d6d77ace96 | |
| parent | 336b9cc4a2f80363cb3b7c7de7ce94a25467eb33 (diff) | |
| download | rt.equinox.framework-b00d09549b8e353c828f0e71936343f2e857cf26.tar.gz rt.equinox.framework-b00d09549b8e353c828f0e71936343f2e857cf26.tar.xz rt.equinox.framework-b00d09549b8e353c828f0e71936343f2e857cf26.zip | |
bug 196889
| -rw-r--r-- | bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java index 1b549e5da..4f389da6d 100644 --- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java +++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/JNIBridge.java @@ -42,11 +42,11 @@ public class JNIBridge { if (idx != -1) { String comLibrary = library.substring(0, idx) + "com_"; //$NON-NLS-1$ comLibrary += library.substring(idx + 8, library.length()); - System.load(comLibrary); + Runtime.getRuntime().load(comLibrary); OleInitialize(0); } } - System.load(library); + Runtime.getRuntime().load(library); } catch (UnsatisfiedLinkError e) { //failed } diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java index 1bc172b2f..870c8c761 100644 --- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java +++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java @@ -1779,8 +1779,8 @@ public class Main { bridge.showSplash(splashLocation); long handle = bridge.getSplashHandle(); if(handle != 0 && handle != -1) { - System.setProperty("org.eclipse.equinox.launcher.splash.handle", String.valueOf(handle)); //$NON-NLS-1$ - System.setProperty("org.eclipse.equinox.launcher.splash.location", splashLocation); //$NON-NLS-1$ + System.getProperties().put("org.eclipse.equinox.launcher.splash.handle", String.valueOf(handle)); //$NON-NLS-1$ + System.getProperties().put("org.eclipse.equinox.launcher.splash.location", splashLocation); //$NON-NLS-1$ bridge.updateSplash(); } } |