Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B7C38200BBA for ; Sat, 5 Nov 2016 23:05:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B661A160B09; Sat, 5 Nov 2016 22:05:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 311E3160AE9 for ; Sat, 5 Nov 2016 23:05:12 +0100 (CET) Received: (qmail 43231 invoked by uid 500); 5 Nov 2016 22:05:11 -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 43221 invoked by uid 99); 5 Nov 2016 22:05:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Nov 2016 22:05:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B944E03D1; Sat, 5 Nov 2016 22:05:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blue@apache.org To: commits@avro.apache.org Date: Sat, 05 Nov 2016 22:05:11 -0000 Message-Id: <7e75c1829d6f4ed4a3851ecb303e43d2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] avro git commit: AVRO-1907 ADDENDUM: Do not warn when logical type name is null. archived-at: Sat, 05 Nov 2016 22:05:12 -0000 Repository: avro Updated Branches: refs/heads/branch-1.8 620b2807e -> edf6a7e6c AVRO-1907 ADDENDUM: Do not warn when logical type name is null. Project: http://git-wip-us.apache.org/repos/asf/avro/repo Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/695efafb Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/695efafb Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/695efafb Branch: refs/heads/branch-1.8 Commit: 695efafb45f96c9d9ae0f905ef3c33fe75751612 Parents: 620b280 Author: Ryan Blue Authored: Sat Nov 5 14:56:35 2016 -0700 Committer: Ryan Blue Committed: Sat Nov 5 15:04:14 2016 -0700 ---------------------------------------------------------------------- lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/avro/blob/695efafb/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java ---------------------------------------------------------------------- diff --git a/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java b/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java index 742b2fc..2f75594 100644 --- a/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java +++ b/lang/java/avro/src/main/java/org/apache/avro/LogicalTypes.java @@ -61,7 +61,9 @@ public class LogicalTypes { LogicalType logicalType; try { - if (TIMESTAMP_MILLIS.equals(typeName)) { + if (typeName == null) { + logicalType = null; + } else if (TIMESTAMP_MILLIS.equals(typeName)) { logicalType = TIMESTAMP_MILLIS_TYPE; } else if (DECIMAL.equals(typeName)) { logicalType = new Decimal(schema);