#ignite-51: IgniteTxEntry implements Message: small fixs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0aedd9ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0aedd9ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0aedd9ce Branch: refs/heads/ignite-user-req Commit: 0aedd9cee143f4c121112217c916c952abcc92eb Parents: 3d2415a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Mar 4 11:41:39 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Mar 4 11:41:39 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridDistributedTxPrepareRequest.java | 6 ++++-- .../internal/processors/cache/transactions/IgniteTxEntry.java | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0aedd9ce/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index b94c9ba..5de5e07 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -320,9 +320,11 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr) throws IgniteCheckedException { super.finishUnmarshal(ctx, ldr); - unmarshalTx(writes, false, ctx, ldr); + if (writes != null) + unmarshalTx(writes, false, ctx, ldr); - unmarshalTx(reads, false, ctx, ldr); + if (reads != null) + unmarshalTx(reads, false, ctx, ldr); if (grpLockKeyBytes != null && grpLockKey == null) grpLockKey = ctx.marshaller().unmarshal(grpLockKeyBytes, ldr); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0aedd9ce/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 cdfe7a6..4ac2ab6 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 @@ -49,10 +49,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message { /** */ private static final long serialVersionUID = 0L; - /** */ - @SuppressWarnings({"NonConstantFieldWithUpperCaseName", "AbbreviationUsage", "UnusedDeclaration"}) - private static Object GG_CLASS_ID; - /** Owning transaction. */ @GridToStringExclude @GridDirectTransient
