Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6899818412 for ; Tue, 2 Feb 2016 15:24:29 +0000 (UTC) Received: (qmail 95416 invoked by uid 500); 2 Feb 2016 15:24:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 95318 invoked by uid 500); 2 Feb 2016 15:24:07 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 95300 invoked by uid 99); 2 Feb 2016 15:24:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Feb 2016 15:24:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 11279E0C09; Tue, 2 Feb 2016 15:24:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: av@apache.org To: commits@ignite.apache.org Date: Tue, 02 Feb 2016 15:24:10 -0000 Message-Id: <083386b78796480abb2af0ddba101f3a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] ignite git commit: 2224 (cherry picked from commit dcb572e) Merge fix 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 Authored: Tue Feb 2 18:21:42 2016 +0300 Committer: Anton Vinogradov 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;