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 2015/06/18 21:48:21 UTC

[11/50] incubator-ignite git commit: ignite-484-1 - group partition reservation minor

ignite-484-1 - group partition reservation minor


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

Branch: refs/heads/ignite-980
Commit: b5db5597c53261cc06470f44955eede0e6cde6d3
Parents: 2bd3321
Author: S.Vladykin <sv...@gridgain.com>
Authored: Thu Jun 11 09:21:15 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Thu Jun 11 09:21:15 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtLocalPartition.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5db5597/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 e858e42..3cee866 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
@@ -521,7 +521,7 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>,
         if (state.getReference() == RENTING && state.getStamp() == 0 && !groupReserved())
             clearAll();
 
-        if (map.isEmpty() && state.compareAndSet(RENTING, EVICTED, 0, 0)) {
+        if (map.isEmpty() && state.compareAndSet(RENTING, EVICTED, 0, 0) && !groupReserved()) {
             if (log.isDebugEnabled())
                 log.debug("Evicted partition: " + this);