diff options
| author | Andrey Loskutov | 2018-01-22 08:45:11 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2018-01-22 09:56:39 +0000 |
| commit | bd89ee55c9defa5b740795c48fe0065aa23073c0 (patch) | |
| tree | 09e84e4db0497337cc1c58ea4115cb27c5fdc603 | |
| parent | 0dd15a54e4d203d304c1c9d3ca86cb65378f32dd (diff) | |
| download | eclipse.jdt.ui-bd89ee55c9defa5b740795c48fe0065aa23073c0.tar.gz eclipse.jdt.ui-bd89ee55c9defa5b740795c48fe0065aa23073c0.tar.xz eclipse.jdt.ui-bd89ee55c9defa5b740795c48fe0065aa23073c0.zip | |
Bug 530108 - update jar-in-jar-loader.zipM20180131-0400M20180125-0335M20180124-0610M20180124-0400
This patch updates the original patch to avoid ant compiler error from
build_jar-in-jar-loader.xml on varargs and updates the
jar-in-jar-loader.zip to contain latest bits. Only JarRsrcLoader.class
is changed in the zip file.
Change-Id: Ief7180b2390f8a5f7059052d0c517f6815b97a13
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
(cherry picked from commit 4ae4137ea10a7071e0725b7b60c8f576aa2c2796)
| -rw-r--r-- | org.eclipse.jdt.ui/jar in jar loader/org/eclipse/jdt/internal/jarinjarloader/JarRsrcLoader.java | 6 | ||||
| -rw-r--r-- | org.eclipse.jdt.ui/jar-in-jar-loader.zip | bin | 7438 -> 7686 bytes |
2 files changed, 3 insertions, 3 deletions
diff --git a/org.eclipse.jdt.ui/jar in jar loader/org/eclipse/jdt/internal/jarinjarloader/JarRsrcLoader.java b/org.eclipse.jdt.ui/jar in jar loader/org/eclipse/jdt/internal/jarinjarloader/JarRsrcLoader.java index 0b7bbcc3a1..4d69b6edbd 100644 --- a/org.eclipse.jdt.ui/jar in jar loader/org/eclipse/jdt/internal/jarinjarloader/JarRsrcLoader.java +++ b/org.eclipse.jdt.ui/jar in jar loader/org/eclipse/jdt/internal/jarinjarloader/JarRsrcLoader.java @@ -65,10 +65,10 @@ public class JarRsrcLoader { try { // We use reflection here because the method ClassLoader.getPlatformClassLoader() // is only present starting from Java 9 - Method platformClassLoader = ClassLoader.class.getMethod("getPlatformClassLoader"); - return (ClassLoader) platformClassLoader.invoke(null); + Method platformClassLoader = ClassLoader.class.getMethod("getPlatformClassLoader", (Class[])null); //$NON-NLS-1$ + return (ClassLoader) platformClassLoader.invoke(null, (Object[]) null); } catch (NoSuchMethodException e) { - // This is a safe value to be used on Java 8 an previous versions + // This is a safe value to be used on Java 8 and previous versions return null; } } diff --git a/org.eclipse.jdt.ui/jar-in-jar-loader.zip b/org.eclipse.jdt.ui/jar-in-jar-loader.zip Binary files differindex 4f7dc71f18..4ee2ee6926 100644 --- a/org.eclipse.jdt.ui/jar-in-jar-loader.zip +++ b/org.eclipse.jdt.ui/jar-in-jar-loader.zip |