ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1239 Reverted changes in localPeek, instead in scan iterator use 'cache.peekEx'. Removed in CacheQueryFallbackFuture internal future listener assuming CacheQueryFallbackFuture.get is never called.
Date Wed, 16 Sep 2015 14:25:14 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1239 80e086797 -> 8fae522f6


ignite-1239 Reverted changes in localPeek, instead in scan iterator use 'cache.peekEx'.  Removed
in CacheQueryFallbackFuture internal future listener assuming CacheQueryFallbackFuture.get
is never called.


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

Branch: refs/heads/ignite-1239
Commit: 8fae522f642a7453d827bc4b2e82dc5f57395f6b
Parents: 80e0867
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Sep 16 17:25:05 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Sep 16 17:25:05 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/query/GridCacheQueryAdapter.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8fae522f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 1fed68a..855e239 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -664,7 +664,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T>
{
                     return fut.next();
                 }
                 catch (IgniteClientDisconnectedCheckedException e) {
-                    throw U.convertException(e);
+                    throw CU.convertToCacheException(e);
                 }
                 catch (IgniteCheckedException e) {
                     retryIfPossible(e);
@@ -697,7 +697,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T>
{
                     retryFut = ex.retryReadyFuture();
                 }
                 else
-                    throw U.convertException(e);
+                    throw CU.convertToCacheException(e);
 
                 if (F.isEmpty(nodes)) {
                     if (--unreservedNodesRetryCnt > 0) {
@@ -711,13 +711,13 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T>
{
                         init();
                     }
                     else
-                        throw U.convertException(e);
+                        throw CU.convertToCacheException(e);
                 }
                 else
                     init();
             }
             catch (IgniteCheckedException ex) {
-                throw U.convertException(ex);
+                throw CU.convertToCacheException(ex);
             }
         }
     }


Mime
View raw message