Return-Path: X-Original-To: apmail-avro-commits-archive@www.apache.org Delivered-To: apmail-avro-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 001FE9C75 for ; Wed, 9 May 2012 08:34:03 +0000 (UTC) Received: (qmail 38154 invoked by uid 500); 9 May 2012 08:34:03 -0000 Delivered-To: apmail-avro-commits-archive@avro.apache.org Received: (qmail 38082 invoked by uid 500); 9 May 2012 08:34:03 -0000 Mailing-List: contact commits-help@avro.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@avro.apache.org Delivered-To: mailing list commits@avro.apache.org Received: (qmail 38058 invoked by uid 99); 9 May 2012 08:34:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 May 2012 08:34:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 May 2012 08:34:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2052E23889EC for ; Wed, 9 May 2012 08:33:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1335985 - in /avro/trunk: CHANGES.txt lang/c++/impl/json/JsonIO.cc lang/c++/test/JsonTests.cc Date: Wed, 09 May 2012 08:33:38 -0000 To: commits@avro.apache.org From: thiru@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120509083339.2052E23889EC@eris.apache.org> Author: thiru Date: Wed May 9 08:33:38 2012 New Revision: 1335985 URL: http://svn.apache.org/viewvc?rev=1335985&view=rev Log: AVRO-1080. JsonIO.cc should allow \u escape sequence in string Modified: avro/trunk/CHANGES.txt avro/trunk/lang/c++/impl/json/JsonIO.cc avro/trunk/lang/c++/test/JsonTests.cc Modified: avro/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1335985&r1=1335984&r2=1335985&view=diff ============================================================================== --- avro/trunk/CHANGES.txt (original) +++ avro/trunk/CHANGES.txt Wed May 9 08:33:38 2012 @@ -40,6 +40,8 @@ Avro 1.7.0 (unreleased) AVRO-1070. AvroSequenceFileOutputFormat is in wrong package. (thiru) + AVRO-1080. JsonIO.cc should allow \u escape sequence in string. (Keh-Li Sheng via thiru) + Avro 1.6.3 (5 March 2012) IMPROVEMENTS Modified: avro/trunk/lang/c++/impl/json/JsonIO.cc URL: http://svn.apache.org/viewvc/avro/trunk/lang/c%2B%2B/impl/json/JsonIO.cc?rev=1335985&r1=1335984&r2=1335985&view=diff ============================================================================== --- avro/trunk/lang/c++/impl/json/JsonIO.cc (original) +++ avro/trunk/lang/c++/impl/json/JsonIO.cc Wed May 9 08:33:38 2012 @@ -265,6 +265,7 @@ JsonParser::Token JsonParser::tryString( case 't': sv.push_back('\t'); continue; + case 'u': case 'U': { unsigned int n = 0; Modified: avro/trunk/lang/c++/test/JsonTests.cc URL: http://svn.apache.org/viewvc/avro/trunk/lang/c%2B%2B/test/JsonTests.cc?rev=1335985&r1=1335984&r2=1335985&view=diff ============================================================================== --- avro/trunk/lang/c++/test/JsonTests.cc (original) +++ avro/trunk/lang/c++/test/JsonTests.cc Wed May 9 08:33:38 2012 @@ -61,6 +61,8 @@ TestData doubleData[] = { TestData stringData[] = { { "\"\"", etString, "" }, { "\"a\"", etString, "a" }, + { "\"\\U000a\"", etString, "\n" }, + { "\"\\u000a\"", etString, "\n" }, { "\"\\\"\"", etString, "\"" }, { "\"\\/\"", etString, "/" }, };