felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r641226 - /felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
Date Wed, 26 Mar 2008 09:48:08 GMT
Author: fmeschbe
Date: Wed Mar 26 02:48:07 2008
New Revision: 641226

URL: http://svn.apache.org/viewvc?rev=641226&view=rev
Log:
FELIX-503 Account for path info being null in case of direct resource access

Modified:
    felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java

Modified: felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
URL: http://svn.apache.org/viewvc/felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java?rev=641226&r1=641225&r2=641226&view=diff
==============================================================================
--- felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
(original)
+++ felix/trunk/http.jetty/src/main/java/org/mortbay/jetty/servlet/OsgiResourceHolder.java
Wed Mar 26 02:48:07 2008
@@ -85,7 +85,13 @@
     {
         HttpServletRequest request = ( HttpServletRequest ) sRequest;
         HttpServletResponse response = ( HttpServletResponse ) sResponse;
+        
+        // get the relative path (assume empty path if there is no path info)
+        // (FELIX-503)
         String target = request.getPathInfo();
+        if (target == null) {
+            target = "";
+        }
 
         Activator.debug( "handle for name:" + getName() + "(path=" + target + ")" );
 



Mime
View raw message