Repository: incubator-ignite Updated Branches: refs/heads/ignite-368 3780457f7 -> 1991b0ee0
# ignite-51 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/efd4d5ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/efd4d5ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/efd4d5ae Branch: refs/heads/ignite-368 Commit: efd4d5aee7dd11adf0d2405247e524d0065e4051 Parents: 7c2cde3 Author: sboikov <sboi...@gridgain.com> Authored: Fri Mar 6 14:32:36 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Mar 6 14:32:36 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheEntryInfo.java | 6 +++--- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../cache/distributed/near/GridNearTxPrepareResponse.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efd4d5ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java index 012b9b4..8f47e0f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java @@ -31,6 +31,9 @@ import java.nio.*; */ public class GridCacheEntryInfo implements Message { /** */ + private static final int SIZE_OVERHEAD = 3 * 8 /* reference */ + 4 /* int */ + 2 * 8 /* long */ + 32 /* version */; + + /** */ private static final long serialVersionUID = 0L; /** Cache key. */ @@ -63,9 +66,6 @@ public class GridCacheEntryInfo implements Message { @GridDirectTransient private boolean deleted; - /** */ - private static final int SIZE_OVERHEAD = 3 * 8 /* reference */ + 4 /* int */ + 2 * 8 /* long */ + 32 /* version */; - /** * @return Cache ID. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efd4d5ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index cb4c777..3d29e21 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -500,7 +500,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu this.err.get() == null ? tx.commitAsync() : tx.rollbackAsync(); fut.listenAsync(new CIX1<IgniteInternalFuture<IgniteInternalTx>>() { - @Override public void applyx(IgniteInternalFuture<IgniteInternalTx> gridCacheTxGridFuture) { + @Override public void applyx(IgniteInternalFuture<IgniteInternalTx> fut) { try { if (replied.compareAndSet(false, true)) sendPrepareResponse(res); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efd4d5ae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index 711c01f..c7460d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -97,6 +97,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse * @param miniId Mini future ID. * @param dhtVer DHT version. * @param invalidParts Invalid partitions. + * @param retVal Return value. * @param err Error. */ public GridNearTxPrepareResponse(
