diff options
| author | Alexandre Honorat | 2020-01-04 18:24:24 +0000 |
|---|---|---|
| committer | Niraj Modi | 2020-01-06 08:15:15 +0000 |
| commit | cd1b880b70ed36f2268f038fb3081d46d5e6a95b (patch) | |
| tree | a06b3699736a7fbdf4841aff2b29c293e41d6ca2 | |
| parent | d43549a52ea90f02b04ce37315e895f35aeb8614 (diff) | |
| download | eclipse.platform.swt-cd1b880b70ed36f2268f038fb3081d46d5e6a95b.tar.gz eclipse.platform.swt-cd1b880b70ed36f2268f038fb3081d46d5e6a95b.tar.xz eclipse.platform.swt-cd1b880b70ed36f2268f038fb3081d46d5e6a95b.zip | |
Bug 558681 - Check internal library load even if extracted
Change-Id: I0e697762ff903cdca484c5df77f786a27059042b
Signed-off-by: Alexandre Honorat <alexandre.honorat@yahoo.fr>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java index 0259ca29e3..cf82199660 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/common/org/eclipse/swt/internal/Library.java @@ -331,12 +331,10 @@ public static void loadLibrary (String name, boolean mapName) { /* Try extracting and loading library from jar. */ if (path != null) { if (extract (path + SEPARATOR + fileName1, mappedName1)) { - load(path + SEPARATOR + fileName1, message); - return; + if (load(path + SEPARATOR + fileName1, message)) return; } if (mapName && extract (path + SEPARATOR + fileName2, mappedName2)) { - load(path + SEPARATOR + fileName2, message); - return; + if (load(path + SEPARATOR + fileName2, message)) return; } } |