ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-471: method resolution fix
Date Mon, 18 May 2015 10:05:43 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-471 ef3180b35 -> 06b031a7b


ignite-471: method resolution fix


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

Branch: refs/heads/ignite-471
Commit: 06b031a7bf02c3a66dbd362f197224f82797e6d9
Parents: ef3180b
Author: Denis Magda <dmagda@gridgain.com>
Authored: Mon May 18 13:05:11 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Mon May 18 13:05:11 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheSwapManager.java    | 2 +-
 .../processors/cache/distributed/GridDistributedCacheAdapter.java | 3 ++-
 .../processors/cache/distributed/dht/GridDhtLocalPartition.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06b031a7/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 332cbc5..91f2ce1 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
@@ -1616,7 +1616,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
                 }
 
                 @Override protected void onRemove() throws IgniteCheckedException {
-                    KeyCacheObject key = cctx.toCacheKeyObject(cur.getKey());
+                    KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(cur.getKey()));
 
                     int part = cctx.affinity().partition(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06b031a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index c5ef22f..e6757b7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -38,6 +38,7 @@ import org.apache.ignite.transactions.*;
 import org.jetbrains.annotations.*;
 
 import java.io.*;
+import java.nio.*;
 import java.util.*;
 
 import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*;
@@ -378,7 +379,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
 
                             if (iter != null) {
                                 for (Map.Entry<byte[], GridCacheSwapEntry> e : iter)
-                                    dataLdr.removeDataInternal(ctx.toCacheKeyObject(e.getKey()));
+                                    dataLdr.removeDataInternal(ctx.toCacheKeyObject(ByteBuffer.wrap(e.getKey())));
                             }
                         }
                         finally {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06b031a7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 94a78e6..ce63591 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -613,7 +613,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>
                 byte[] keyBytes = entry.getKey();
 
                 try {
-                    KeyCacheObject key = cctx.toCacheKeyObject(keyBytes);
+                    KeyCacheObject key = cctx.toCacheKeyObject(ByteBuffer.wrap(keyBytes));
 
                     lastEntry = (GridDhtCacheEntry)cctx.cache().entryEx(key, false);
 


Mime
View raw message