You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2012/06/26 23:29:43 UTC
svn commit: r1354248 - in /myfaces/tobago/branches/tobago-1.5.x: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
tobago-core/src/test/java/org/apache/myfaces/tobago/util/JavascriptWriterUtilsTest.java
Author: bommel
Date: Tue Jun 26 21:29:42 2012
New Revision: 1354248
URL: http://svn.apache.org/viewvc?rev=1354248&view=rev
Log:
Merged from trunk
(TOBAGO-1138) Avoid using String.replace inside ResponseWriter [from revision 1354247]
Added:
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/test/java/org/apache/myfaces/tobago/util/JavascriptWriterUtilsTest.java
- copied unchanged from r1354247, myfaces/tobago/trunk/tobago-core/src/test/java/org/apache/myfaces/tobago/util/JavascriptWriterUtilsTest.java
Modified:
myfaces/tobago/branches/tobago-1.5.x/ (props changed)
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
Propchange: myfaces/tobago/branches/tobago-1.5.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1354247
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java?rev=1354248&r1=1354247&r2=1354248&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/JavascriptWriterUtils.java Tue Jun 26 21:29:42 2012
@@ -37,7 +37,7 @@ public final class JavascriptWriterUtils
CHARS_TO_ESCAPE['\r'] = "\\r".toCharArray(); // Carriage return
CHARS_TO_ESCAPE['"'] = "\\\"".toCharArray();
- CHARS_TO_ESCAPE['\\'] = "\\\\\\\\".toCharArray();
+ CHARS_TO_ESCAPE['\\'] = "\\\\".toCharArray();
CHARS_TO_ESCAPE[0x7F] = EMPTY; // Delete