You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by jw...@apache.org on 2011/04/08 01:55:30 UTC

svn commit: r1090065 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java

Author: jwaldman
Date: Thu Apr  7 23:55:30 2011
New Revision: 1090065

URL: http://svn.apache.org/viewvc?rev=1090065&view=rev
Log:
TRINIDAD-2085 absolute urls for icon selectors preprends context-root when it shouldn't

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java?rev=1090065&r1=1090064&r2=1090065&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java Thu Apr  7 23:55:30 2011
@@ -400,7 +400,7 @@ public class StyleSheetDocument
        boolean startsWithASlash = uri.startsWith("/");
       Style inlineStyle = propertyMap.isEmpty() ? null : new UnmodifiableStyle(propertyMap);
 
-       if (!startsWithASlash)
+       if (!startsWithASlash && !uri.startsWith("http"))
        {
          icon =
            new ContextImageIcon(uri, uri, width, height, null, inlineStyle);