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 6BDDE200BF9 for ; Sun, 25 Dec 2016 05:59:39 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6AC81160B2F; Sun, 25 Dec 2016 04:59:39 +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 90064160B40 for ; Sun, 25 Dec 2016 05:59:38 +0100 (CET) Received: (qmail 59079 invoked by uid 500); 25 Dec 2016 04:59:37 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 58896 invoked by uid 99); 25 Dec 2016 04:59:37 -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; Sun, 25 Dec 2016 04:59:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 377F9DFBE9; Sun, 25 Dec 2016 04:59:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@phoenix.apache.org Date: Sun, 25 Dec 2016 04:59:39 -0000 Message-Id: <1e105b3a51f04a659151dabd057a7e73@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] phoenix git commit: PHOENIX-3505 Avoid NPE on close() in OrderedResultIterator archived-at: Sun, 25 Dec 2016 04:59:39 -0000 PHOENIX-3505 Avoid NPE on close() in OrderedResultIterator Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/45b78922 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/45b78922 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/45b78922 Branch: refs/heads/4.8-HBase-1.2 Commit: 45b789223b4368b202d9cf14634fdbfddf7671e0 Parents: 3d42051 Author: Josh Elser Authored: Wed Nov 23 11:16:35 2016 -0500 Committer: Josh Elser Committed: Sat Dec 24 23:36:29 2016 -0500 ---------------------------------------------------------------------- .../phoenix/iterate/OrderedResultIterator.java | 5 ++- .../iterate/OrderedResultIteratorTest.java | 41 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/45b78922/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java index 8dcb2e8..da75bb7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OrderedResultIterator.java @@ -279,7 +279,10 @@ public class OrderedResultIterator implements PeekingResultIterator { @Override public void close() throws SQLException { - resultIterator.close(); + // Guard against resultIterator being null + if (null != resultIterator) { + resultIterator.close(); + } resultIterator = PeekingResultIterator.EMPTY_ITERATOR; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/45b78922/phoenix-core/src/test/java/org/apache/phoenix/iterate/OrderedResultIteratorTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/OrderedResultIteratorTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/OrderedResultIteratorTest.java new file mode 100644 index 0000000..50ed8e9 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/OrderedResultIteratorTest.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to you under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.phoenix.iterate; + +import java.sql.SQLException; +import java.util.Collections; +import java.util.List; + +import org.apache.phoenix.expression.OrderByExpression; +import org.junit.Test; + +/** + * Test class for {@link OrderedResultIterator}. + */ +public class OrderedResultIteratorTest { + + @Test + public void testNullIteratorOnClose() throws SQLException { + ResultIterator delegate = ResultIterator.EMPTY_ITERATOR; + List orderByExpressions = Collections.singletonList(null); + int thresholdBytes = Integer.MAX_VALUE; + OrderedResultIterator iterator = new OrderedResultIterator(delegate, orderByExpressions, thresholdBytes); + // Should not throw an exception + iterator.close(); + } + +}