Repository: ignite Updated Branches: refs/heads/master c27fec3c3 -> aed482df5
IGNITE-6186: Removed redundant parameter. Signed-off-by: Andrey Gura <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aed482df Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aed482df Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aed482df Branch: refs/heads/master Commit: aed482df502d7d481074732bbc7c7ee4247ee72b Parents: c27fec3 Author: Andrey Kuznetsov <[email protected]> Authored: Fri Mar 30 20:15:04 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Fri Mar 30 20:15:04 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/future/GridFutureAdapter.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/aed482df/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java index f8c0b14..fa5c4df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridFutureAdapter.java @@ -180,7 +180,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { interrupted = true; if (!ignoreInterrupts) { - unregisterWaiter(Thread.currentThread()); + unregisterWaiter(); throw new IgniteInterruptedCheckedException("Got interrupted while waiting for future to complete."); } @@ -222,7 +222,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { interrupted = true; if (!ignoreInterrupts) { - unregisterWaiter(Thread.currentThread()); + unregisterWaiter(); throw new IgniteInterruptedCheckedException("Got interrupted while waiting for future to complete."); } @@ -237,7 +237,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { Thread.currentThread().interrupt(); } - unregisterWaiter(Thread.currentThread()); + unregisterWaiter(); throw new IgniteFutureTimeoutCheckedException("Timeout was reached before computation completed."); } @@ -284,9 +284,9 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { } /** - * @param waiter Waiter to unregister. + * Unregisters current thread from waiters list. */ - private void unregisterWaiter(Thread waiter) { + private void unregisterWaiter() { Node prev = null; Object cur = state; @@ -297,7 +297,7 @@ public class GridFutureAdapter<R> implements IgniteInternalFuture<R> { Object curWaiter = ((Node)cur).val; Node next = ((Node)cur).next; - if (curWaiter == waiter) { + if (curWaiter == Thread.currentThread()) { if (prev == null) { Object n = next == null ? INIT : next;
