You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/04/08 13:38:30 UTC
[15/16] incubator-ignite git commit: ignite-624 - minor2
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-sprint-3
Commit: c2c4da48a9ebaf5d41e61bb006e9d590edcd5f8b
Parents: ab2fe77
Author: S.Vladykin <sv...@gridgain.com>
Authored: Wed Apr 8 14:33:23 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
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} */