Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9826817A1A for ; Thu, 9 Apr 2015 08:13:05 +0000 (UTC) Received: (qmail 82536 invoked by uid 500); 9 Apr 2015 08:12:31 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82502 invoked by uid 500); 9 Apr 2015 08:12:31 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 82488 invoked by uid 99); 9 Apr 2015 08:12:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Apr 2015 08:12:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 09 Apr 2015 08:12:29 +0000 Received: (qmail 80051 invoked by uid 99); 9 Apr 2015 08:12:06 -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; Thu, 09 Apr 2015 08:12:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15C18DFF6A; Thu, 9 Apr 2015 08:12:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 09 Apr 2015 08:12:42 -0000 Message-Id: <466ae4990f9b420b842800e0adba9f93@git.apache.org> In-Reply-To: <59eb4e3db4cf4e69b24f0143d935ae98@git.apache.org> References: <59eb4e3db4cf4e69b24f0143d935ae98@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] incubator-ignite git commit: ignite-624 - minor2 X-Virus-Checked: Checked by ClamAV on apache.org ignite-624 - minor2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2c4da48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2c4da48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2c4da48 Branch: refs/heads/ignite-452 Commit: c2c4da48a9ebaf5d41e61bb006e9d590edcd5f8b Parents: ab2fe77 Author: S.Vladykin Authored: Wed Apr 8 14:33:23 2015 +0300 Committer: S.Vladykin Committed: Wed Apr 8 14:33:23 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/h2/sql/GridSqlSelect.java | 3 +++ .../ignite/internal/processors/query/h2/sql/GridSqlUnion.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java index dadba7c..0786eac 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java @@ -148,6 +148,9 @@ public class GridSqlSelect extends GridSqlQuery { * @param expression Expression. */ public void setSelectExpression(int colIdx, GridSqlElement expression) { + if (expression == null) + throw new NullPointerException(); + if (colIdx < select.size()) // Assuming that all the needed expressions were already added. select.set(colIdx, expression); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2c4da48/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java index dcc2c84..23c18ed 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlUnion.java @@ -42,7 +42,7 @@ public class GridSqlUnion extends GridSqlQuery { /** {@inheritDoc} */ @Override protected GridSqlElement expression(int col) { - return null; + throw new IllegalStateException(); } /** {@inheritDoc} */