Author: nbelaevski Date: 2011-02-18 08:14:12 -0500 (Fri, 18 Feb 2011) New Revision: 21759 Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java Log: https://issues.jboss.org/browse/RF-10560 Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2011-02-18 13:13:49 UTC (rev 21758) +++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/RenderKitUtils.java 2011-02-18 13:14:12 UTC (rev 21759) @@ -33,6 +33,7 @@ import java.util.Set; import java.util.TreeSet; +import javax.faces.application.Application; import javax.faces.application.Resource; import javax.faces.application.ResourceHandler; import javax.faces.component.UIComponent; @@ -709,11 +710,16 @@ return null; } + Application application = context.getApplication(); + ExternalContext externalContext = context.getExternalContext(); + String value = url; - value = context.getApplication().getViewHandler().getResourceURL(context, value); + if (value.length() == 0 || value.charAt(0) != '/' || !value.startsWith(externalContext.getRequestContextPath())) { + value = application.getViewHandler().getResourceURL(context, value); + } - return context.getExternalContext().encodeResourceURL(value); + return externalContext.encodeResourceURL(value); } public static Object getFirstNonEmptyAttribute(String attributeName, UIComponent component) {