Bug 530108 - update jar-in-jar-loader.zip
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)
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 0b7bbcc..4d69b6e 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 @@
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
index 4f7dc71..4ee2ee6 100644
--- a/org.eclipse.jdt.ui/jar-in-jar-loader.zip
+++ b/org.eclipse.jdt.ui/jar-in-jar-loader.zip
Binary files differ
