You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2015/10/22 15:01:58 UTC

[42/42] ignite git commit: Merge remote-tracking branch 'apache-main/ignite-1272' into ignite-1272

Merge remote-tracking branch 'apache-main/ignite-1272' into ignite-1272

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java


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

Branch: refs/heads/ignite-1272
Commit: ddbe92e6c39bded90e0a9459aa4568c02e6dde8e
Parents: 5d94314 344bf0c
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Oct 22 15:59:50 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Oct 22 15:59:50 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridEventConsumeHandler.java    | 16 +++++++++-------
 .../internal/processors/cache/GridCacheMessage.java |  2 +-
 .../distributed/dht/GridDhtTxPrepareRequest.java    | 11 ++++++-----
 .../cache/transactions/IgniteTxEntry.java           |  8 +++-----
 .../apache/ignite/marshaller/jdk/JdkMarshaller.java |  2 +-
 5 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe92e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index f424b0f,eb014d0..f68c204
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@@ -349,9 -357,9 +349,9 @@@ public abstract class GridCacheMessage 
              for (IgniteTxEntry e : txEntries) {
                  e.marshal(ctx, transferExpiry);
  
-                 GridCacheContext cctx = ctx.cacheContext(e.cacheId());
+                 GridCacheContext cctx = e.context();
  
 -                if (cctx.deploymentEnabled()) {
 +                if (addDepInfo) {
                      if (e.key() != null)
                          prepareObject(e.key().value(cctx.cacheObjectContext(), false), cctx);
  

http://git-wip-us.apache.org/repos/asf/ignite/blob/ddbe92e6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 29d26f8,12c0f3c..fcd66c2
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@@ -286,12 -284,13 +286,13 @@@ public class GridDhtTxPrepareRequest ex
  
              ownedVals = owned.values();
  
-             for (IgniteTxKey key : ownedKeys)
-                 key.prepareMarshal(ctx.cacheContext(key.cacheId()));
+             for (IgniteTxKey key: ownedKeys) {
+                 GridCacheContext cctx = ctx.cacheContext(key.cacheId());
  
-             if (addDepInfo) {
-                 for (IgniteTxKey k : owned.keySet())
-                     prepareObject(k, ctx.cacheContext(k.cacheId()));
+                 key.prepareMarshal(cctx);
+ 
 -                if (ctx.deploymentEnabled() && cctx.deploymentEnabled())
++                if (addDepInfo)
+                     prepareObject(key, cctx);
              }
          }