summaryrefslogtreecommitdiff
path: root/lib/javame
diff options
context:
space:
mode:
authorJens Geyer <jensg@apache.org>2013-12-26 18:56:54 +0100
committerJens Geyer <jensg@apache.org>2013-12-26 18:59:15 +0100
commit797595049274b9085385de5ef402075f6fc3de56 (patch)
tree8bd64a12f152d31852be3a97e4ea80d612bf0fb0 /lib/javame
parent53db7cc486a9f1f0e000d977d853a6811238a9e6 (diff)
downloadthrift-797595049274b9085385de5ef402075f6fc3de56.tar.gz
THRIFT-2285 TJsonProtocol implementation for Java/JavaMe/PHP doesn't allow a slash (/) to be escaped (\/)
Patch: Jens Geyer
Diffstat (limited to 'lib/javame')
-rw-r--r--lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java b/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
index fd92d453e..de7086f7d 100644
--- a/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
+++ b/lib/javame/src/org/apache/thrift/protocol/TJSONProtocol.java
@@ -66,10 +66,10 @@ public class TJSONProtocol extends TProtocol {
1, 1, '"', 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 2
};
- private static final String ESCAPE_CHARS = "\"\\bfnrt";
+ private static final String ESCAPE_CHARS = "\"\\/bfnrt";
private static final byte[] ESCAPE_CHAR_VALS = {
- '"', '\\', '\b', '\f', '\n', '\r', '\t',
+ '"', '\\', '/', '\b', '\f', '\n', '\r', '\t',
};
private static final int DEF_STRING_SIZE = 16;