You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/12/06 04:41:04 UTC
svn commit: r354276 -
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java
Author: svieujot
Date: Mon Dec 5 19:40:59 2005
New Revision: 354276
URL: http://svn.apache.org/viewcvs?rev=354276&view=rev
Log:
Remove null appened to URI introduced at r354196 when request.getPathInfo() is null.
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java?rev=354276&r1=354275&r2=354276&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/AddResource.java Mon Dec 5 19:40:59 2005
@@ -536,7 +536,8 @@
public void serveResource(HttpServletRequest request, HttpServletResponse response)
throws IOException
{
- String uri = request.getContextPath() + request.getServletPath() + request.getPathInfo();
+ String pathInfo = request.getPathInfo();
+ String uri = request.getContextPath() + request.getServletPath() + (pathInfo == null ? "" : pathInfo);
String classNameStartsAfter = RESOURCE_VIRTUAL_PATH + '/';
int posStartClassName = uri.indexOf(classNameStartsAfter) + classNameStartsAfter.length();