You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/07/17 09:29:35 UTC
svn commit: r1691490 - in
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard:
PerBundleServletContextImpl.java SharedServletContextImpl.java
Author: cziegeler
Date: Fri Jul 17 07:29:35 2015
New Revision: 1691490
URL: http://svn.apache.org/r1691490
Log:
Fix getResourceAsStream
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java?rev=1691490&r1=1691489&r2=1691490&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/PerBundleServletContextImpl.java Fri Jul 17 07:29:35 2015
@@ -174,13 +174,25 @@ public class PerBundleServletContextImpl
}
@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);
}
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java?rev=1691490&r1=1691489&r2=1691490&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/whiteboard/SharedServletContextImpl.java Fri Jul 17 07:29:35 2015
@@ -309,18 +309,7 @@ public class SharedServletContextImpl im
@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;
}