ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [36/50] [abbrv] incubator-ignite git commit: # ignite-51
Date Wed, 11 Mar 2015 11:08:08 GMT
# ignite-51


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

Branch: refs/heads/ignite-368
Commit: 68e47936b6d33e103140a34354e354645ddcc907
Parents: 2bcd647
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Mar 10 16:29:22 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Mar 10 16:43:47 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheSwapManager.java  | 4 ++--
 .../processors/cache/GridCacheAbstractQuerySelfTest.java        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68e47936/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index 91f9d23..d6aef65 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -617,8 +617,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
 
                         if (qryMgr != null) {
                             qryMgr.onUnswap(key.value(cctx.cacheObjectContext(), false),
-                                    v.value(cctx.cacheObjectContext(), false),
-                                    valBytes);
+                                v.value(cctx.cacheObjectContext(), false),
+                                valBytes);
                         }
                     }
                     catch (IgniteCheckedException e) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/68e47936/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 1748fd9..0107cd2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@ -1123,7 +1123,8 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
             }
         };
 
-        assertTrue(val.getClass().getName().endsWith("GridCacheAbstractQuerySelfTest$16"));
+        assertTrue("Unexpected name: " + val.getClass().getName(),
+            val.getClass().getName().endsWith("GridCacheAbstractQuerySelfTest$14"));
 
         assertTrue(cache.putx(1, val));
 
@@ -1136,7 +1137,7 @@ public abstract class GridCacheAbstractQuerySelfTest extends GridCommonAbstractT
         assertEquals(1, res.size());
 
         CacheQuery<List<?>> fieldsQry = cache.queries().createSqlFieldsQuery(
-            "select field1 from GridCacheAbstractQuerySelfTest_16");
+            "select field1 from GridCacheAbstractQuerySelfTest_14");
 
         fieldsQry.enableDedup(true);
 


Mime
View raw message