Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4cebd51e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4cebd51e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4cebd51e Branch: refs/heads/ignite-3553 Commit: 4cebd51ed021e9c9478c8a19b9449e8b3c544005 Parents: 9a28f0d Author: vozerov-gridgain <[email protected]> Authored: Wed Jul 27 16:19:16 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Jul 27 16:19:16 2016 +0300 ---------------------------------------------------------------------- .../igfs/client/IgfsClientManager.java | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4cebd51e/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientManager.java index 65584fd..db5b45d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientManager.java @@ -47,7 +47,6 @@ import java.util.concurrent.ConcurrentLinkedDeque; import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; import static org.apache.ignite.events.EventType.EVT_NODE_LEFT; -import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED; /** * Manager to handle IGFS client closures. @@ -79,10 +78,7 @@ public class IgfsClientManager extends IgfsManager { private final ConcurrentLinkedDeque<IgfsClientInOperation> pending = new ConcurrentLinkedDeque<>(); /** Worker to process pending requests. */ - private final PendingRequestsWorker pendingWorker = new PendingRequestsWorker(); - - /** Whether pending requests worker started. */ - private boolean pendingWorkerStarted; + private PendingRequestsWorker pendingWorker; /** * Constructor. @@ -110,9 +106,9 @@ public class IgfsClientManager extends IgfsManager { ready = true; if (!pending.isEmpty()) { - new IgniteThread(pendingWorker).start(); + pendingWorker = new PendingRequestsWorker(ctx.gridName(), "igfs-client-pending-request-worker", log); - pendingWorkerStarted = true; + new IgniteThread(pendingWorker).start(); } } finally { @@ -126,22 +122,22 @@ public class IgfsClientManager extends IgfsManager { ctx.io().removeMessageListener(GridTopic.TOPIC_IGFS_CLI, msgLsnr); - boolean pendingWorkerStarted0; + PendingRequestsWorker pendingWorker0; rwLock.writeLock().lock(); try { stopping = true; - pendingWorkerStarted0 = pendingWorkerStarted; + pendingWorker0 = pendingWorker; } finally { rwLock.writeLock().unlock(); } - if (pendingWorkerStarted0) { - U.cancel(pendingWorker); - U.join(pendingWorker, log); + if (pendingWorker0 != null) { + U.cancel(pendingWorker0); + U.join(pendingWorker0, log); } }
