myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1569173 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
Date Tue, 18 Feb 2014 03:32:16 GMT
Author: lu4242
Date: Tue Feb 18 03:32:15 2014
New Revision: 1569173

URL: http://svn.apache.org/r1569173
Log:
MYFACES-3854 oam-compress-spaces remove carriage return / line feed in CDATA sections

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1569173&r1=1569172&r2=1569173&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
Tue Feb 18 03:32:15 2014
@@ -179,7 +179,11 @@ final class TextUnit extends Compilation
                         }
                         else
                         {
-                            s = compressELText(s);
+                            if (instructionBuffer.size() > 0 && 
+                                !(instructionBuffer.get(instructionBuffer.size()-1) instanceof
LiteralXMLInstruction))
+                            {
+                                s = compressELText(s);
+                            }
                             this.instructionBuffer.add(new TextInstruction(this.alias, ELText.parse(s)
));
                         }
                     }



Mime
View raw message