You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/02/18 04:32:44 UTC
svn commit: r1569174 -
/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
Author: lu4242
Date: Tue Feb 18 03:32:44 2014
New Revision: 1569174
URL: http://svn.apache.org/r1569174
Log:
MYFACES-3854 oam-compress-spaces remove carriage return / line feed in CDATA sections
Modified:
myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java?rev=1569174&r1=1569173&r2=1569174&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java Tue Feb 18 03:32:44 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) ));
}
}