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 0256A17D5F for ; Tue, 3 Mar 2015 03:48:03 +0000 (UTC) Received: (qmail 611 invoked by uid 500); 3 Mar 2015 03:48:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 579 invoked by uid 500); 3 Mar 2015 03:48:02 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 570 invoked by uid 99); 3 Mar 2015 03:48:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 03:48:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Mar 2015 03:48:01 +0000 Received: (qmail 453 invoked by uid 99); 3 Mar 2015 03:47:41 -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, 03 Mar 2015 03:47:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2532EE03B9; Tue, 3 Mar 2015 03:47:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: IGNITE-141 - Fixed IGFS tests. Date: Tue, 3 Mar 2015 03:47:41 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-141 f26b0e82a -> 7aad6a484 IGNITE-141 - Fixed IGFS tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7aad6a48 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7aad6a48 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7aad6a48 Branch: refs/heads/ignite-141 Commit: 7aad6a4849caa023e4a9270bc142855733e3e002 Parents: f26b0e8 Author: Alexey Goncharuk Authored: Mon Mar 2 19:47:36 2015 -0800 Committer: Alexey Goncharuk Committed: Mon Mar 2 19:47:36 2015 -0800 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 2 +- .../apache/ignite/internal/processors/cache/GridCacheContext.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aad6a48/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 6c15a61..70d2fd5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3680,7 +3680,7 @@ public abstract class GridCacheAdapter implements GridCache, /** {@inheritDoc} */ @Nullable @Override public Transaction tx() { - IgniteTxAdapter tx = ctx.tm().threadLocalTx(null); + IgniteTxAdapter tx = ctx.tm().threadLocalTx(ctx); return tx == null ? null : new TransactionProxyImpl<>(tx, ctx.shared(), false); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aad6a48/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index b02871d..f2e71ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -312,7 +312,7 @@ public class GridCacheContext implements Externalizable { else cacheId = 1; - sys = CU.MARSH_CACHE_NAME.equals(cacheName) || CU.UTILITY_CACHE_NAME.equals(cacheName); + sys = ctx.cache().systemCache(cacheName); plc = sys ? UTILITY_CACHE_POOL : SYSTEM_POOL;