[5/6] ignite git commit: 2224 (cherry picked from commit dcb572e) Merge fix

[av...@apache.org]

2224
(cherry picked from commit dcb572e)
Merge fix


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

Branch: refs/heads/ignite-1.5.7
Commit: 5787d6e4c76c4f274f0b96559ce2c8430e08a027
Parents: b630fbf
Author: Anton Vinogradov <av...@apache.org>
Authored: Tue Feb 2 18:21:42 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue Feb 2 18:21:42 2016 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/transactions/IgniteTxEntry.java       | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5787d6e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index 3282323..6cdac07 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import javax.cache.expiry.ExpiryPolicy;
 import javax.cache.processor.EntryProcessor;
 import org.apache.ignite.IgniteCache;