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 48D99200C37 for ; Sun, 19 Mar 2017 19:45:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4771E160B7D; Sun, 19 Mar 2017 18:45:53 +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 8FC5A160B6D for ; Sun, 19 Mar 2017 19:45:52 +0100 (CET) Received: (qmail 30695 invoked by uid 500); 19 Mar 2017 18:45:51 -0000 Mailing-List: contact commits-help@calcite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@calcite.apache.org Delivered-To: mailing list commits@calcite.apache.org Received: (qmail 30686 invoked by uid 99); 19 Mar 2017 18:45:51 -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, 19 Mar 2017 18:45:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60946DFE8F; Sun, 19 Mar 2017 18:45:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@calcite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: calcite git commit: [CALCITE-1699] Statement may be null Date: Sun, 19 Mar 2017 18:45:51 +0000 (UTC) archived-at: Sun, 19 Mar 2017 18:45:53 -0000 Repository: calcite Updated Branches: refs/heads/master 0e11746ac -> 554d963ec [CALCITE-1699] Statement may be null Per Javadoc, when the ResultSet that created a Statement was created from a DatabaseMetaData call, the Statement may be null. Closes apache/calcite#403 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/554d963e Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/554d963e Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/554d963e Branch: refs/heads/master Commit: 554d963ece3bbcd7a36fc1b9922c8a5c6e1444c1 Parents: 0e11746 Author: Josh Elser Authored: Wed Mar 15 01:15:52 2017 -0400 Committer: Josh Elser Committed: Sun Mar 19 14:43:11 2017 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/calcite/avatica/jdbc/StatementInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/554d963e/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/StatementInfo.java ---------------------------------------------------------------------- diff --git a/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/StatementInfo.java b/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/StatementInfo.java index ff27d05..c4f8e21 100644 --- a/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/StatementInfo.java +++ b/avatica/server/src/main/java/org/apache/calcite/avatica/jdbc/StatementInfo.java @@ -20,7 +20,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.sql.Statement; -import java.util.Objects; /** * All we know about a statement. Encapsulates a {@link ResultSet}. @@ -37,7 +36,8 @@ public class StatementInfo { private boolean resultsInitialized = false; public StatementInfo(Statement statement) { - this.statement = Objects.requireNonNull(statement); + // May be null when coming from a DatabaseMetaData call + this.statement = statement; } // Visible for testing