# HG changeset patch # User Jiri Vanek # Date 1385558054 -3600 # Node ID 461eb0b77b5312ce4c4736aafe07b3e0411355c5 # Parent 719431dbd56cff70a704d4500859caa60768cca9 Added null check when getting manifest attributes for case of jar without manifest * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getManifestAttribute) added check fo null manifest to prevent npe. diff -r 719431dbd56c -r 461eb0b77b53 ChangeLog --- a/ChangeLog Thu Nov 14 10:56:29 2013 +0100 +++ b/ChangeLog Wed Nov 27 14:14:14 2013 +0100 @@ -1,3 +1,8 @@ +2013-11-26 Jiri Vanek + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getManifestAttribute) + added check for null manifest to prevent npe. + 2013-11-13 Andrew Azores * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: add diff -r 719431dbd56c -r 461eb0b77b53 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Nov 14 10:56:29 2013 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 27 14:14:14 2013 +0100 @@ -927,8 +927,12 @@ JarFile mainJar = null; try { mainJar = new JarFile(f); - attributeValue = mainJar.getManifest(). - getMainAttributes().getValue(attribute); + Manifest manifest = mainJar.getManifest(); + if (manifest == null || manifest.getMainAttributes() == null){ + //yes, jars without manifest exists + return null; + } + attributeValue = manifest.getMainAttributes().getValue(attribute); } catch (IOException ioe) { attributeValue = null; } finally {