From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 13 Nov 2009 13:16:43 +0000 (+0000)
Subject: Added null check as all jars do not include a manifest
X-Git-Tag: 6.7.0.beta1~2299
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ade8ee559514d7c28a6e45ca99c10626910af59e;p=vaadin-framework.git

Added null check as all jars do not include a manifest

svn changeset:9787/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
index cdc569cb66..29e92fb625 100644
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
@@ -222,10 +222,13 @@ public class ClassPathExplorer {
                     System.out.println(url);
                     JarFile jarFile = conn.getJarFile();
                     Manifest manifest = jarFile.getManifest();
-                    Attributes mainAttributes = manifest.getMainAttributes();
-                    if (mainAttributes.getValue("Vaadin-Widgetsets") != null) {
-                        System.err.println("Accepted jar file" + url);
-                        return true;
+                    if (manifest != null) {
+                        Attributes mainAttributes = manifest
+                                .getMainAttributes();
+                        if (mainAttributes.getValue("Vaadin-Widgetsets") != null) {
+                            System.err.println("Accepted jar file" + url);
+                            return true;
+                        }
                     }
                 } catch (MalformedURLException e) {
                     // TODO Auto-generated catch block