[08/12] ignite git commit: Minor. .

2017-02-22 Thread sergi
Minor. .


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f4d36cb6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f4d36cb6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f4d36cb6

Branch: refs/heads/ignite-1.9
Commit: f4d36cb683b82bc0d059f183a586be4662818bbc
Parents: 2e90a07
Author: Andrey V. Mashenkov 
Authored: Tue Feb 21 15:29:52 2017 +0300
Committer: Andrey V. Mashenkov 
Committed: Tue Feb 21 15:29:52 2017 +0300

--
 .../internal/processors/query/h2/sql/GridSqlQuerySplitter.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f4d36cb6/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 165b6b8..779e565 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -1628,7 +1628,7 @@ public class GridSqlQuerySplitter {
 findParams(((GridSqlSubquery)el).subquery(), params, target, 
paramIdxs);
 else {
 for (int i = 0; i < el.size(); i++)
-findParams(el.child(i), params, target, paramIdxs);
+findParams((GridSqlAst)el.child(i), params, target, paramIdxs);
 }
 }
 



[08/12] ignite git commit: minor

2015-11-30 Thread agoncharuk
minor


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/776af1a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/776af1a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/776af1a5

Branch: refs/heads/ignite-1.5.1
Commit: 776af1a5aade09174422de9b8f5d04f1ce50d458
Parents: 8e605e9
Author: Yakov Zhdanov 
Authored: Mon Nov 30 17:32:59 2015 +0300
Committer: Yakov Zhdanov 
Committed: Mon Nov 30 17:32:59 2015 +0300

--
 .../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/776af1a5/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index 484ee87..740b166 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -62,6 +62,7 @@ public class GridCacheCommandHandlerSelfTest extends 
GridCommonAbstractTest {
 TcpDiscoverySpi disco = new TcpDiscoverySpi();
 
 disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
+disco.setJoinTimeout(5000);
 
 // Cache config.
 CacheConfiguration cacheCfg = defaultCacheConfiguration();