You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2017/05/29 15:24:44 UTC
svn commit: r1796649 - in /sling/trunk/bundles/jcr/contentparser/src:
main/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.java
test/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverterTest.java
Author: sseifert
Date: Mon May 29 15:24:44 2017
New Revision: 1796649
URL: http://svn.apache.org/viewvc?rev=1796649&view=rev
Log:
SLING-6916 JCR Content Parser: Tick parsing fails when string contains escaped escaped character
Modified:
sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.java
sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverterTest.java
Modified: sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.java?rev=1796649&r1=1796648&r2=1796649&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.java (original)
+++ sling/trunk/bundles/jcr/contentparser/src/main/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverter.java Mon May 29 15:24:44 2017
@@ -50,6 +50,9 @@ public final class JsonTicksConverter {
if (in != '\'') {
output.append("\\");
}
+ if (in == '\\') {
+ output.append("\\");
+ }
escaped = false;
}
else {
Modified: sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverterTest.java?rev=1796649&r1=1796648&r2=1796649&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverterTest.java (original)
+++ sling/trunk/bundles/jcr/contentparser/src/test/java/org/apache/sling/jcr/contentparser/impl/JsonTicksConverterTest.java Mon May 29 15:24:44 2017
@@ -69,4 +69,9 @@ public class JsonTicksConverterTest {
assertEquals("{\"p\":\"\\u03A9\\u03A6\\u00A5\"}", tickToDoubleQuote("{'p':\"\\u03A9\\u03A6\\u00A5\"}"));
}
+ @Test
+ public void testTickToQuoteWithDoubleBackslash() {
+ assertEquals("{\"p\":\"aa\\\\bb\"}", tickToDoubleQuote("{'p':\"aa\\\\bb\"}"));
+ }
+
}