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 270BED963 for ; Thu, 16 May 2013 17:34:16 +0000 (UTC) Received: (qmail 84048 invoked by uid 500); 16 May 2013 17:34:16 -0000 Delivered-To: apmail-avro-commits-archive@avro.apache.org Received: (qmail 83965 invoked by uid 500); 16 May 2013 17:34:15 -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 83955 invoked by uid 99); 16 May 2013 17:34:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 17:34:15 +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; Thu, 16 May 2013 17:34:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0AA7C2388906; Thu, 16 May 2013 17:33:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483463 - in /avro/trunk: CHANGES.txt lang/java/avro/src/main/java/org/apache/avro/Schema.java Date: Thu, 16 May 2013 17:33:53 -0000 To: commits@avro.apache.org From: cutting@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130516173354.0AA7C2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cutting Date: Thu May 16 17:33:53 2013 New Revision: 1483463 URL: http://svn.apache.org/r1483463 Log: AVRO-1331. Java: Fix schema-parsing incompatibility introduced in AVRO-1295. Modified: avro/trunk/CHANGES.txt avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java Modified: avro/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1483463&r1=1483462&r2=1483463&view=diff ============================================================================== --- avro/trunk/CHANGES.txt (original) +++ avro/trunk/CHANGES.txt Thu May 16 17:33:53 2013 @@ -86,6 +86,9 @@ Trunk (not yet released) AVRO-1316. Java: Fix compiler to split long schema string constants so javac can compile them. (Jeremy Kahn via cutting) + AVRO-1331. Java: Fix schema-parsing incompatibility from AVRO-1295. + (cutting) + Avro 1.7.4 (22 February 2012) NEW FEATURES Modified: avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java URL: http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java?rev=1483463&r1=1483462&r2=1483463&view=diff ============================================================================== --- avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java (original) +++ avro/trunk/lang/java/avro/src/main/java/org/apache/avro/Schema.java Thu May 16 17:33:53 2013 @@ -1068,7 +1068,7 @@ public abstract class Schema extends Jso Schema result; String type = getRequiredText(schema, "type", "No type"); Name name = null; - String savedSpace = null; + String savedSpace = names.space(); String doc = null; if (type.equals("record") || type.equals("error") || type.equals("enum") || type.equals("fixed")) { @@ -1079,7 +1079,6 @@ public abstract class Schema extends Jso name = new Name(getRequiredText(schema, "name", "No name in schema"), space); if (name.space != null) { // set default namespace - savedSpace = names.space(); names.space(name.space); } } @@ -1161,8 +1160,7 @@ public abstract class Schema extends Jso if (!SCHEMA_RESERVED.contains(prop)) // ignore reserved result.addProp(prop, schema.get(prop)); } - if (savedSpace != null) - names.space(savedSpace); // restore space + names.space(savedSpace); // restore space if (result instanceof NamedSchema) { Set aliases = parseAliases(schema); if (aliases != null) // add aliases