commit 5f1d2ed828032ea6b323b7693d3276c1ceb1400d
author Carsten Ziegeler <cziegeler@apache.org> Fri Jul 17 07:29:35 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Jul 17 07:29:35 2015 +0000
tree 7d785ec13e381b4f01c62aaa53de7019f42aefeb
parent 917aacdddf5ab419d4347507405c84a394bd5914

Fix getResourceAsStream

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1691490 13f79535-47bb-0310-9956-ffa450edef68

http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
index 9d9d845..b68b3ca 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
@@ -174,13 +174,25 @@
     }
 
     @Override
-    public InputStream getResourceAsStream(String path)
+    public InputStream getResourceAsStream(final String path)
     {
-        return delegatee.getResourceAsStream(path);
+        final URL res = getResource(path);
+        if (res != null)
+        {
+            try
+            {
+                return res.openStream();
+            }
+            catch (IOException e)
+            {
+                // Do nothing
+            }
+        }
+        return null;
     }
 
     @Override
-    public RequestDispatcher getRequestDispatcher(String path)
+    public RequestDispatcher getRequestDispatcher(final String path)
     {
         return delegatee.getRequestDispatcher(path);
     }

http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java

diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
index c5f8ca1..75aa90c 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
@@ -309,18 +309,7 @@
     @Override
     public InputStream getResourceAsStream(final String path)
     {
-        final URL res = getResource(path);
-        if (res != null)
-        {
-            try
-            {
-                return res.openStream();
-            }
-            catch (IOException e)
-            {
-                // Do nothing
-            }
-        }
+        // This is implemented by the ServletContext wrapper created in the Dispatcher
         return null;
     }