You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/06/13 07:46:33 UTC
[03/39] ignite git commit: ignite-5196 JDBC Driver fix
ignite-5196 JDBC Driver fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5120a245
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5120a245
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5120a245
Branch: refs/heads/ignite-5272
Commit: 5120a245ee5819ee3602b659e4146362cd38adc0
Parents: 8555e21
Author: Igor Seliverstov <gv...@gmail.com>
Authored: Wed Jun 7 15:00:16 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jun 7 15:00:16 2017 +0300
----------------------------------------------------------------------
.../processors/cache/query/jdbc/GridCacheQueryJdbcTask.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5120a245/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 4ae8a8a..ba87cff 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -106,9 +106,9 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
else {
String cache = (String)args.get("cache");
- Map<? extends ComputeJob, ClusterNode> node = mapToNode(subgrid, args, first, cache);
+ Map<? extends ComputeJob, ClusterNode> node = null;
- if (node == null && cache == null) {
+ if (cache == null) {
boolean start = ignite.configuration().isClientMode();
IgniteCache<?, ?> cache0 =
@@ -117,6 +117,8 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
if (cache0 != null)
node = mapToNode(subgrid, args, first, cache0.getName());
}
+ else
+ node = mapToNode(subgrid, args, first, cache);
if (node != null)
return node;