You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/11 09:12:36 UTC
ignite git commit: IGNITE-3477 - Fixing tests
Repository: ignite
Updated Branches:
refs/heads/ignite-3477-master 01b088fed -> da7093add
IGNITE-3477 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da7093ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da7093ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da7093ad
Branch: refs/heads/ignite-3477-master
Commit: da7093add24a8efb6cf55f9e6686ec3d44c52ba5
Parents: 01b088f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 11 12:07:20 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 11 12:12:53 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtLocalPartition.java | 8 ++------
.../processors/cache/transactions/IgniteTxHandler.java | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/da7093ad/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 8566b35..e8489e2 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
@@ -429,6 +429,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
release0(0);
}
+ /** {@inheritDoc} */
@Override protected void release(int sizeChange, GridCacheEntryEx e) {
release0(sizeChange);
}
@@ -457,12 +458,7 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
if (reservations == 0 && shouldBeRenting)
rent(true);
- try {
- tryEvict();
- }
- catch (NodeStoppingException ignore) {
- // No-op.
- }
+ tryEvictAsync(false);
break;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/da7093ad/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index a34c5d6..099a4ae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -121,7 +121,7 @@ public class IgniteTxHandler {
IgniteInternalFuture<GridNearTxPrepareResponse> fut = prepareTx(nearNodeId, null, req);
- assert req.txState() != null || fut.error() != null ||
+ assert req.txState() != null || fut == null || fut.error() != null ||
(ctx.tm().tx(req.version()) == null && ctx.tm().nearTx(req.version()) == null);
return fut;