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

Posted to commits@myfaces.apache.org by ar...@apache.org on 2011/02/18 18:41:31 UTC

svn commit: r1072081 - /myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java

Author: arobinson74
Date: Fri Feb 18 17:41:31 2011
New Revision: 1072081

URL: http://svn.apache.org/viewvc?rev=1072081&view=rev
Log:
TRINIDAD-2039 - Return null for empty string resources to match Trinidad 2

Modified:
    myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java

Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java?rev=1072081&r1=1072080&r2=1072081&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java Fri Feb 18 17:41:31 2011
@@ -269,6 +269,12 @@ public class CoreRenderer extends Render
       return null;
 
     String uri = o.toString();
+    
+    // TRINIDAD-2039: do not return URI's for empty resource values
+    if (uri.length() == 0)
+    {
+      return null;
+    }
 
     // Treat two slashes as server-relative
     if (uri.startsWith("//"))