From commits-return-1338-archive-asf-public=cust-asf.ponee.io@parquet.apache.org Mon Jun 4 17:52:32 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 44F70180636 for ; Mon, 4 Jun 2018 17:52:32 +0200 (CEST) Received: (qmail 80908 invoked by uid 500); 4 Jun 2018 15:52:31 -0000 Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@parquet.apache.org Delivered-To: mailing list commits@parquet.apache.org Received: (qmail 80899 invoked by uid 99); 4 Jun 2018 15:52:31 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jun 2018 15:52:31 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id B25E582980; Mon, 4 Jun 2018 15:52:30 +0000 (UTC) Date: Mon, 04 Jun 2018 15:52:30 +0000 To: "commits@parquet.apache.org" Subject: [parquet-mr] branch master updated: PARQUET-1317: Fix ParquetMetadataConverter throw NPE (#489) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <152812755064.23160.8190403945756941469@gitbox.apache.org> From: zivanfi@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: parquet-mr X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: aed9097640c7adffe1151b32e86b5efc3702c657 X-Git-Newrev: 3fd2492fcce073f0c36e4d7e23e34881557e6e5e X-Git-Rev: 3fd2492fcce073f0c36e4d7e23e34881557e6e5e X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. zivanfi pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/parquet-mr.git The following commit(s) were added to refs/heads/master by this push: new 3fd2492 PARQUET-1317: Fix ParquetMetadataConverter throw NPE (#489) 3fd2492 is described below commit 3fd2492fcce073f0c36e4d7e23e34881557e6e5e Author: Yuming Wang AuthorDate: Mon Jun 4 23:52:28 2018 +0800 PARQUET-1317: Fix ParquetMetadataConverter throw NPE (#489) --- .../org/apache/parquet/format/converter/ParquetMetadataConverter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java index 40c0b84..2baad15 100644 --- a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java +++ b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java @@ -1170,9 +1170,9 @@ public class ParquetMetadataConverter { } if (schemaElement.isSetConverted_type()) { LogicalTypeAnnotation originalType = getOriginalType(schemaElement.converted_type, schemaElement); - LogicalTypeAnnotation newLogicalType = getOriginalType(schemaElement.logicalType); + LogicalTypeAnnotation newLogicalType = schemaElement.isSetLogicalType() ? getOriginalType(schemaElement.logicalType) : null; if (!originalType.equals(newLogicalType)) { - childBuilder.as(getOriginalType(schemaElement.converted_type, schemaElement)); + childBuilder.as(originalType); } } if (schemaElement.isSetField_id()) { -- To stop receiving notification emails like this one, please contact zivanfi@apache.org.