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/08/02 17:57:27 UTC
svn commit: r1153172 - in /myfaces/trinidad/branches/1.2.12.6.0-branch: ./
trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/
trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
trinidad-sandb...
Author: arobinson74
Date: Tue Aug 2 15:57:26 2011
New Revision: 1153172
URL: http://svn.apache.org/viewvc?rev=1153172&view=rev
Log:
TRINIDAD-2039 - backport the fix in Trinidad 2 to this branch
Modified:
myfaces/trinidad/branches/1.2.12.6.0-branch/ (props changed)
myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed)
myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed)
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 2 15:57:26 2011
@@ -4,4 +4,5 @@
/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402:745675
/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/branches/trinidad-1.2.x:1072081
/myfaces/trinidad/trunk:894885,915962,962582,1002826,1031716,1076418,1096803,1096816,1096825
Modified: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java?rev=1153172&r1=1153171&r2=1153172&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java (original)
+++ myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/CoreRenderer.java Tue Aug 2 15:57:26 2011
@@ -185,6 +185,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("//"))
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 2 15:57:26 2011
@@ -3,4 +3,5 @@
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:895708
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675
+/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:1072081
/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:894885,915962,962582,1002826,1031716,1076418,1096803,1096816,1096825
Propchange: myfaces/trinidad/branches/1.2.12.6.0-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 2 15:57:26 2011
@@ -3,4 +3,5 @@
/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:895708
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496
/myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675
+/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:1072081
/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:894885,915962,962582,1002826,1031716,1076418,1096803,1096816,1096825