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 2015/03/03 04:47:41 UTC
incubator-ignite git commit: IGNITE-141 - Fixed IGFS tests.
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 <ag...@gridgain.com>
Authored: Mon Mar 2 19:47:36 2015 -0800
Committer: Alexey Goncharuk <ag...@gridgain.com>
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<K, V> implements GridCache<K, V>,
/** {@inheritDoc} */
@Nullable @Override public Transaction tx() {
- IgniteTxAdapter<K, V> tx = ctx.tm().threadLocalTx(null);
+ IgniteTxAdapter<K, V> 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<K, V> 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;