Repository: incubator-ignite Updated Branches: refs/heads/ignite-80 e70810687 -> f5910027c
#IGNITE-80 Debug Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f5910027 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f5910027 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f5910027 Branch: refs/heads/ignite-80 Commit: f5910027c1aa9116d6c5e768154fc77c9277714e Parents: e708106 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Apr 14 16:10:06 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Apr 14 16:10:06 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheIoManager.java | 2 +- .../internal/processors/cache/transactions/IgniteTxEntry.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5910027/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index bedfe55..ac67464 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -234,7 +234,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { "you should have all required classes in CLASSPATH on all nodes in topology) " + "[senderId=" + nodeId + ", err=" + X.cause(e, ClassNotFoundException.class).getMessage() + ']'); else - U.error(log, "Failed to process message [senderId=" + nodeId + ']', e); + U.error(log, "Failed to process message [senderId=" + nodeId + ", msg=" + cacheMsg + ']', e); } finally { if (depEnabled) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f5910027/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 95d3527..8519732 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 @@ -720,6 +720,9 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { if (this.ctx == null) { GridCacheContext<?, ?> cacheCtx = ctx.cacheContext(cacheId); + assert cacheCtx != null : "Missing cache context [locNodeId=" + ctx.localNodeId() + + ", cacheId=" + cacheId + ", entry=" + this + ']'; + if (cacheCtx.isNear() && !near) cacheCtx = cacheCtx.near().dht().context(); else if (!cacheCtx.isNear() && near)
