/hg/icedtea-web: Fixed behavior of JarIndexAccess to better copy...

[jvanek at icedtea.classpath.org]

changeset d09eb6e90db7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d09eb6e90db7
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Nov 08 11:26:13 2016 +0100

	Fixed behavior of JarIndexAccess to better copy original JarIndex usage

	* netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java: (JarIndexAccess)if parent is attempted to be null,  object is not created (JarIndexAccess) if result of method invoking is null, null is returned rather then JarIndexAccess with null parent. Note - this error successfully fixed PR2219 (see NoClassDeff reproducer) but still it looks as bad idea to wrap/replace ClassNotFound error/exception by different exception.


diffstat:

 ChangeLog                                                  |  11 +++++++++++
 netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java |   6 ++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diffs (41 lines):

diff -r f243a4832f32 -r d09eb6e90db7 ChangeLog
--- a/ChangeLog	Fri Nov 04 12:11:44 2016 +0100
+++ b/ChangeLog	Tue Nov 08 11:26:13 2016 +0100
@@ -1,3 +1,14 @@
+2016-11-08  Jiri Vanek <jvanek at redhat.com>
+
+	Fixed behavior of JarIndexAccess to better copy original JarIndex usage
+	* netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java: 
+	(JarIndexAccess)if parent is attempted to be null,  object is not created
+	(JarIndexAccess) if result of method invoking is null, null is returned
+	rather then JarIndexAccess with null parent.
+	Note - this error successfully fixed PR2219 (see NoClassDeff reproducer) but
+	still it looks as bad idea to wrap/replace ClassNotFound error/exception by
+	different exception.
+
 2016-11-04  Jiri Vanek <jvanek at redhat.com>
 
 	Plugin made run on jdk9
diff -r f243a4832f32 -r d09eb6e90db7 netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java
--- a/netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java	Fri Nov 04 12:11:44 2016 +0100
+++ b/netx/net/sourceforge/jnlp/jdk89acesses/JarIndexAccess.java	Tue Nov 08 11:26:13 2016 +0100
@@ -34,6 +34,9 @@
     }
 
     private JarIndexAccess(Object parent) {
+        if (parent == null) {
+            throw new RuntimeException("JarFile can notbe null!");
+        }
         this.parent = parent;
     }
 
@@ -48,6 +51,9 @@
     public static JarIndexAccess getJarIndexImpl(JarFile jarFile) throws IOException, NoSuchMethodException, IllegalAccessException, InvocationTargetException {
         Method method = jarIndexClass.getMethod("getJarIndex", JarFile.class);
         Object o = method.invoke(null, jarFile);
+        if (o == null) {
+            return null;
+        }
         return new JarIndexAccess(o);
     }