You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2010/07/23 12:48:41 UTC
svn commit: r967032 -
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
Author: baranda
Date: Fri Jul 23 10:48:41 2010
New Revision: 967032
URL: http://svn.apache.org/viewvc?rev=967032&view=rev
Log:
Re-fix for MYFACES-2836, the constants used for the CDATA sections contained line returns making some test fail in myfaces-impl
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java?rev=967032&r1=967031&r2=967032&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlResponseWriterImpl.java Fri Jul 23 10:48:41 2010
@@ -99,10 +99,12 @@ public class HtmlResponseWriterImpl
private static final Set<String> s_emptyHtmlElements = new HashSet<String>();
private static final String CDATA_START = "<![CDATA[ \n";
+ private static final String CDATA_START_NO_LINE_RETURN = "<![CDATA[";
private static final String COMMENT_START = "<!--\n";
private static final String CDATA_COMMENT_START = "//<![CDATA[ \n";
private static final String CDATA_COMMENT_END = "\n//]]>";
private static final String CDATA_END = "\n]]>";
+ private static final String CDATA_END_NO_LINE_RETURN = "]]>";
private static final String COMMENT_COMMENT_END = "\n//-->";
private static final String COMMENT_END = "\n-->";
@@ -250,16 +252,18 @@ public class HtmlResponseWriterImpl
@Override
public void startCDATA() throws IOException {
- if (!_cdataOpen) {
- write(CDATA_START);
+ if (!_cdataOpen)
+ {
+ write(CDATA_START_NO_LINE_RETURN);
_cdataOpen = true;
}
}
@Override
public void endCDATA() throws IOException {
- if (_cdataOpen) {
- write(CDATA_END);
+ if (_cdataOpen)
+ {
+ write(CDATA_END_NO_LINE_RETURN);
_cdataOpen = false;
}
}