| commit | f457317854f7111a8209111a9f573dae46704660 | [log] [tgz] |
|---|---|---|
| author | Doug Cutting <cutting@apache.org> | Fri Jul 18 19:13:46 2014 +0000 |
| committer | Doug Cutting <cutting@apache.org> | Fri Jul 18 19:13:46 2014 +0000 |
| tree | 55de327f87d1df60228d5d26f0d45d523ba82426 | |
| parent | def5dab27dbd1f17f9124df5845f469b5c7a8aa0 [diff] | |
| parent | 06d463b1a119c5d8bc4347fa9e280f4096551080 [diff] |
Re-tag 1.7.7-rc0. git-svn-id: https://svn.apache.org/repos/asf/avro/tags/release-1.7.7-rc0@1611774 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt index 80fe1b9..188ec44 100644 --- a/CHANGES.txt +++ b/CHANGES.txt
@@ -66,6 +66,9 @@ AVRO-1536. Ruby: Remove monkeypatching of Enumerable. (Willem van Bergen via martinkl) + AVRO-1546. Java: Change GenericData.Record#toString() to not + escape forward slashes. (Brandon Forehand via cutting) + BUG FIXES AVRO-1446. C#: Correctly handle system errors in RPC.
diff --git a/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java b/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java index 1be8c4c..4c36192 100644 --- a/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java +++ b/lang/java/avro/src/main/java/org/apache/avro/generic/GenericData.java
@@ -502,9 +502,6 @@ case '\t': builder.append("\\t"); break; - case '/': - builder.append("\\/"); - break; default: // Reference: http://www.unicode.org/versions/Unicode5.1.0/ if((ch>='\u0000' && ch<='\u001F') || (ch>='\u007F' && ch<='\u009F') || (ch>='\u2000' && ch<='\u20FF')){
diff --git a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java index 4e2f183..b69322d 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java +++ b/lang/java/avro/src/test/java/org/apache/avro/generic/TestGenericData.java
@@ -318,6 +318,11 @@ mapper.readTree(parser); } + @Test public void testToStringDoesNotEscapeForwardSlash() throws Exception { + GenericData data = GenericData.get(); + assertEquals("\"/\"", data.toString("/")); + } + @Test public void testToStringNanInfinity() throws Exception { GenericData data = GenericData.get(); assertEquals("\"Infinity\"",data.toString(Float.POSITIVE_INFINITY));