From 5e57e66963404eb17d545fbb78cfc6192bb2c1bf Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Thu, 23 Aug 2018 08:27:33 +0200 Subject: Bug 538191 - NPE in SubMonitor.cleanupActiveChild Change-Id: I04cc8a9cc6002fc47ac2c89c212550d69f1216e1 Signed-off-by: Andrey Loskutov --- .../src/org/eclipse/core/runtime/SubMonitor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java index 5b72ed2a1..91243cd24 100644 --- a/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java +++ b/bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java @@ -314,7 +314,7 @@ public final class SubMonitor implements IProgressMonitorWithBlocking { * the parent progress monitor is touched. This points to the last incomplete child * created with split. */ - private SubMonitor lastSubMonitor = null; + private SubMonitor lastSubMonitor; /** * Used to communicate with the root of this progress monitor tree @@ -991,10 +991,11 @@ public final class SubMonitor implements IProgressMonitorWithBlocking { } private void cleanupActiveChild() { - if (lastSubMonitor == null) + IProgressMonitor child = lastSubMonitor; + if (child == null) { return; + } - IProgressMonitor child = lastSubMonitor; lastSubMonitor = null; child.done(); } -- cgit v1.2.3