You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/26 12:13:36 UTC
[08/21] ignite git commit: IGNITE-2236: Field renames.
IGNITE-2236: Field renames.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45e3eecb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45e3eecb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45e3eecb
Branch: refs/heads/ignite-2236
Commit: 45e3eecbb04dea118da1f825b34fd6729dce19bd
Parents: 48d8f8d
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Dec 24 09:25:01 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Dec 24 09:25:01 2015 +0300
----------------------------------------------------------------------
.../util/future/GridCompoundFuture.java | 24 ++++++++------------
1 file changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45e3eecb/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index 8a56160..9d40753 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -45,12 +45,12 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
/** Initialization flag. */
private static final int INIT_FLAG = 0x1;
- /** */
- private static final AtomicIntegerFieldUpdater<GridCompoundFuture> flagsUpd =
+ /** Flags updater. */
+ private static final AtomicIntegerFieldUpdater<GridCompoundFuture> FLAGS_UPD =
AtomicIntegerFieldUpdater.newUpdater(GridCompoundFuture.class, "flags");
- /** */
- private static final AtomicIntegerFieldUpdater<GridCompoundFuture> lsnrCallsUpd =
+ /** Listener calls updater. */
+ private static final AtomicIntegerFieldUpdater<GridCompoundFuture> LSNR_CALLS_UPD =
AtomicIntegerFieldUpdater.newUpdater(GridCompoundFuture.class, "lsnrCalls");
/** Futures. */
@@ -60,15 +60,11 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
@GridToStringInclude
private final IgniteReducer<T, R> rdc;
- /**
- * Updated via {@link #flagsUpd}.
- *
- * @see #INIT_FLAG
- */
+ /** Initialization flag. Updated via {@link #FLAGS_UPD}. */
@SuppressWarnings("unused")
- private volatile int flags;
+ private volatile int initFlag;
- /** Updated via {@link #lsnrCallsUpd}. */
+ /** Listener calls. Updated via {@link #LSNR_CALLS_UPD}. */
@SuppressWarnings("unused")
private volatile int lsnrCalls;
@@ -136,7 +132,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
throw e;
}
- lsnrCallsUpd.incrementAndGet(GridCompoundFuture.this);
+ LSNR_CALLS_UPD.incrementAndGet(GridCompoundFuture.this);
checkComplete();
}
@@ -225,14 +221,14 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* {@link #markInitialized()} method is called on future.
*/
public boolean initialized() {
- return flags == INIT_FLAG;
+ return initFlag == INIT_FLAG;
}
/**
* Mark this future as initialized.
*/
public void markInitialized() {
- if (flagsUpd.compareAndSet(this, 0, INIT_FLAG))
+ if (FLAGS_UPD.compareAndSet(this, 0, INIT_FLAG))
checkComplete();
}