# ignite-283: Minors.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/857ed95b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/857ed95b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/857ed95b Branch: refs/heads/ignite-283 Commit: 857ed95b819b6085d48481b5e3b0d2df7e1c1894 Parents: 055a380 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Feb 18 13:35:51 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Feb 18 13:35:51 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 7 ------- .../processors/cache/GridCacheUpdateAtomicResult.java | 13 ------------- 2 files changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/857ed95b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 68782ff..8314b0c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1642,7 +1642,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(false, retval ? rawGetOrUnmarshalUnlocked(false) : null, null, - null, invokeRes, CU.TTL_ETERNAL, CU.EXPIRE_TIME_ETERNAL, @@ -1702,7 +1701,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(false, retval ? rawGetOrUnmarshalUnlocked(false) : null, null, - null, invokeRes, CU.TTL_ETERNAL, CU.EXPIRE_TIME_ETERNAL, @@ -1779,7 +1777,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(false, retval ? oldVal : null, null, - null, invokeRes, CU.TTL_ETERNAL, CU.EXPIRE_TIME_ETERNAL, @@ -1824,7 +1821,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(false, retval ? oldVal : null, null, - null, invokeRes, CU.TTL_ETERNAL, CU.EXPIRE_TIME_ETERNAL, @@ -1908,7 +1904,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(false, retval ? oldVal : null, null, - null, invokeRes, CU.TTL_ETERNAL, CU.EXPIRE_TIME_ETERNAL, @@ -1984,7 +1979,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(false, cctx.<V>unwrapTemporary(interceptRes.get2()), null, - null, invokeRes, CU.TTL_ETERNAL, CU.EXPIRE_TIME_ETERNAL, @@ -2097,7 +2091,6 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> return new GridCacheUpdateAtomicResult<>(res, oldVal, updated, - valBytes, invokeRes, newTtl, newExpireTime, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/857ed95b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java index 136e1bc..b5596d1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java @@ -39,9 +39,6 @@ public class GridCacheUpdateAtomicResult<K, V> { @GridToStringInclude private final V newVal; - /** New value bytes. */ - private final byte[] newValBytes; - /** New TTL. */ private final long newTtl; @@ -68,7 +65,6 @@ public class GridCacheUpdateAtomicResult<K, V> { * @param success Success flag. * @param oldVal Old value. * @param newVal New value. - * @param newValBytes New value bytes. * @param res Value computed by the {@link EntryProcessor}. * @param newTtl New TTL. * @param conflictExpireTime Explicit DR expire time (if any). @@ -79,7 +75,6 @@ public class GridCacheUpdateAtomicResult<K, V> { public GridCacheUpdateAtomicResult(boolean success, @Nullable V oldVal, @Nullable V newVal, - @Nullable byte[] newValBytes, @Nullable EntryProcessorResult<?> res, long newTtl, long conflictExpireTime, @@ -89,7 +84,6 @@ public class GridCacheUpdateAtomicResult<K, V> { this.success = success; this.oldVal = oldVal; this.newVal = newVal; - this.newValBytes = newValBytes; this.res = res; this.newTtl = newTtl; this.conflictExpireTime = conflictExpireTime; @@ -127,13 +121,6 @@ public class GridCacheUpdateAtomicResult<K, V> { } /** - * @return New value bytes. - */ - @Nullable public byte[] newValueBytes() { - return newValBytes; - } - - /** * @return {@link GridCacheUtils#TTL_NOT_CHANGED} if TTL did not change, otherwise new TTL. */ public long newTtl() {
