commit b4c16808db81219fb7b903003fd1bf978b84ab03
author Matt Magoffin <eclipse.org@msqr.us> Fri Oct 07 10:43:29 2016 +0300
committer Violeta Georgieva <vgeorgieva@pivotal.io> Fri Oct 07 20:40:03 2016 +0300
tree d38ef309bc1849c6b40d1cb35e2fe3c549986c6b
parent 7901dc64552bd7c821d21398b98def01fd3da900

Bug 501935: Fixed NPE thrown if bundle fragment introduces new packages

Signed-off-by: Matt Magoffin <eclipse.org@msqr.us>

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 6d3cf71..532a40c 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015 SAP SE
+ * Copyright (c) 2015, 2016 SAP SE
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -182,7 +182,18 @@
         }
 
         if (path.endsWith(PATH_SEPARATOR) || path.length() == 0) {
-            return this.bundle.getEntry(path);
+            URL url = this.bundle.getEntry(path);
+            if (url == null) {
+                // try fragments
+                for (int i = 0; i < this.fragments.size(); i++) {
+                    Bundle b = this.fragments.get(i);
+                    url = b.getEntry(path);
+                    if (url != null) {
+                        break;
+                    }
+                }
+            }
+            return url;
         }
 
         String searchPath;