Renames.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ff6fefc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ff6fefc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ff6fefc Branch: refs/heads/ignite-2926 Commit: 2ff6fefcdf7729d960f674bce9d4739ea49059bd Parents: dfae05a Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 15 12:43:42 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 15 12:43:42 2016 +0300 ---------------------------------------------------------------------- .../GridNearAtomicSingleUpdateFuture.java | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2ff6fefc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java index fc85db3..0b8aaf7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java @@ -63,11 +63,11 @@ import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRA */ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpdateFuture { /** Keys */ - private Object keys; + private Object key; /** Values. */ @SuppressWarnings({"FieldAccessedSynchronizedAndUnsynchronized"}) - private Object vals; + private Object val; /** Optional arguments for entry processor. */ private Object[] invokeArgs; @@ -87,8 +87,8 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda * @param cache Cache instance. * @param syncMode Write synchronization mode. * @param op Update operation. - * @param keys Keys to update. - * @param vals Values or transform closure. + * @param key Keys to update. + * @param val Values or transform closure. * @param invokeArgs Optional arguments for entry processor. * @param retval Return value require flag. * @param rawRetval {@code True} if should return {@code GridCacheReturn} as future result. @@ -106,8 +106,8 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda GridDhtAtomicCache cache, CacheWriteSynchronizationMode syncMode, GridCacheOperation op, - Object keys, - @Nullable Object vals, + Object key, + @Nullable Object val, @Nullable Object[] invokeArgs, final boolean retval, final boolean rawRetval, @@ -125,8 +125,8 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda assert subjId != null; - this.keys = keys; - this.vals = vals; + this.key = key; + this.val = val; this.invokeArgs = invokeArgs; if (!waitTopFut) @@ -430,7 +430,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda cause.retryReadyFuture(cctx.affinity().affinityReadyFuture(remapTopVer)); - e.add(Collections.singleton(keys), cause); + e.add(Collections.singleton(key), cause); onDone(e); @@ -776,15 +776,15 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda @Nullable GridCacheVersion updVer) throws Exception { Map<UUID, GridNearAtomicUpdateRequest> pendingMappings = U.newHashMap(topNodes.size()); - if (keys == null) + if (key == null) throw new NullPointerException("Null key."); - Object val = this.vals; + Object val = this.val; if (val == null && op != GridCacheOperation.DELETE) throw new NullPointerException("Null value."); - KeyCacheObject cacheKey = cctx.toCacheKeyObject(keys); + KeyCacheObject cacheKey = cctx.toCacheKeyObject(key); if (op != TRANSFORM) val = cctx.toCacheObject(val); @@ -850,15 +850,15 @@ public class GridNearAtomicSingleUpdateFuture extends GridAbstractNearAtomicUpda private GridNearAtomicUpdateRequest mapSingleUpdate(AffinityTopologyVersion topVer, GridCacheVersion futVer, @Nullable GridCacheVersion updVer) throws Exception { - if (keys == null) + if (key == null) throw new NullPointerException("Null key."); - Object val = this.vals; + Object val = this.val; if (val == null && op != GridCacheOperation.DELETE) throw new NullPointerException("Null value."); - KeyCacheObject cacheKey = cctx.toCacheKeyObject(keys); + KeyCacheObject cacheKey = cctx.toCacheKeyObject(key); if (op != TRANSFORM) val = cctx.toCacheObject(val);
