Repository: phoenix Updated Branches: refs/heads/4.8-HBase-0.98 cf6c4f7c4 -> d7d28f19b refs/heads/4.8-HBase-1.0 e7c63d54c -> b7cd8b500 refs/heads/4.8-HBase-1.1 40de1f6cd -> d5d856391 refs/heads/4.8-HBase-1.2 3d4205123 -> 45b789223 refs/heads/4.x-HBase-1.1 2c99685d6 -> cce9a9f35 refs/heads/master c5046047a -> e23634a35
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/e23634a3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e23634a3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e23634a3 Branch: refs/heads/master Commit: e23634a358929516ce210fe06d668ce475eccccb Parents: c504604 Author: Josh Elser <els...@apache.org> Authored: Wed Nov 23 11:16:35 2016 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sat Dec 24 23:11:10 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/e23634a3/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/e23634a3/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<OrderByExpression> orderByExpressions = Collections.singletonList(null); + int thresholdBytes = Integer.MAX_VALUE; + OrderedResultIterator iterator = new OrderedResultIterator(delegate, orderByExpressions, thresholdBytes); + // Should not throw an exception + iterator.close(); + } + +}
