commit ed6c167ebf588c3acab73fcd862dcae768c92368
author Violeta Georgieva <milesg78@gmail.com> Sun Feb 15 09:36:15 2015 +0200
committer Violeta Georgieva <milesg78@gmail.com> Sun Feb 15 09:36:15 2015 +0200
tree bec37dc817469c6709dcbcc23516494258f7813e
parent 3e8b99f1198a4619dd0fcb48ef6fdac14915e6d6

Add checks for null.

org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleJarResource.java

diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleJarResource.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleJarResource.java
index 05c7904..b60f337 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleJarResource.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleJarResource.java
@@ -65,7 +65,7 @@
             }

             return null;

         } finally {

-            if (entry == null) {

+            if (entry == null && jarIs != null) {

                 try {

                     jarIs.close();

                 } catch (IOException ioe) {

org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResource.java

diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResource.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResource.java
index 59e2a5e..39b4833 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResource.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResource.java
@@ -378,9 +378,6 @@
                 pos += n;
             }
         } catch (IOException ioe) {
-            if (getLog().isDebugEnabled()) {
-                getLog().debug("Unable to return [" + getWebappPath() + "] as a byte array", ioe);
-            }
         }
 
         return result;

org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResourceRoot.java

diff --git a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResourceRoot.java b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResourceRoot.java
index 8c25a8d..434ffdb 100644
--- a/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResourceRoot.java
+++ b/org.eclipse.gemini.web.tomcat/src/main/java/org/eclipse/gemini/web/tomcat/internal/bundleresources/BundleWebResourceRoot.java
@@ -87,21 +87,23 @@
             }

         }

 

-        switch (type) {

-            case PRE:

-                addPreResources(resourceSet);

-                break;

-            case CLASSES_JAR:

-                addClassResources(resourceSet);

-                break;

-            case RESOURCE_JAR:

-                addJarResources(resourceSet);

-                break;

-            case POST:

-                addPostResources(resourceSet);

-                break;

-            default:

-                throw new IllegalArgumentException("Unable to create WebResourceSet of unknown type [" + type + "].");

+        if (resourceSet != null) {

+            switch (type) {

+                case PRE:

+                    addPreResources(resourceSet);

+                    break;

+                case CLASSES_JAR:

+                    addClassResources(resourceSet);

+                    break;

+                case RESOURCE_JAR:

+                    addJarResources(resourceSet);

+                    break;

+                case POST:

+                    addPostResources(resourceSet);

+                    break;

+                default:

+                    throw new IllegalArgumentException("Unable to create WebResourceSet of unknown type [" + type + "].");

+            }

         }

     }