You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/02/20 00:52:11 UTC
svn commit: r1569990 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
Author: lu4242
Date: Wed Feb 19 23:52:11 2014
New Revision: 1569990
URL: http://svn.apache.org/r1569990
Log:
MYFACES-3847 HtmlStylesheetRenderer doesn't ignore additional link parameters when checking for the resource
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java?rev=1569990&r1=1569989&r2=1569990&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java Wed Feb 19 23:52:11 2014
@@ -189,6 +189,14 @@ public class HtmlStylesheetRenderer exte
return;
}
+ String additionalQueryParams = null;
+ int index = resourceName.indexOf('?');
+ if (index >= 0)
+ {
+ additionalQueryParams = resourceName.substring(index + 1);
+ resourceName = resourceName.substring(0, index);
+ }
+
Resource resource;
if (libraryName == null)
{
@@ -244,8 +252,13 @@ public class HtmlStylesheetRenderer exte
writer.writeAttribute(HTML.TYPE_ATTR,
(resource.getContentType() == null ? HTML.STYLE_TYPE_TEXT_CSS
: resource.getContentType()) , null);
+ String path = resource.getRequestPath();
+ if (additionalQueryParams != null)
+ {
+ path = path + ((path.indexOf('?') >= 0) ? "&" : "?") + additionalQueryParams;
+ }
writer.writeURIAttribute(HTML.HREF_ATTR,
- facesContext.getExternalContext().encodeResourceURL(resource.getRequestPath()), null);
+ facesContext.getExternalContext().encodeResourceURL(path), null);
writer.endElement(HTML.LINK_ELEM);
}
}