diff options
| author | Andrey Loskutov | 2018-08-23 06:27:33 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2018-08-23 06:27:33 +0000 |
| commit | 5e57e66963404eb17d545fbb78cfc6192bb2c1bf (patch) | |
| tree | 260cfb280789349f6e16a2c2a4654649cb8b18a6 | |
| parent | 9f1dcac99e6c986e0fd94c9d0b7bcea29721e824 (diff) | |
| download | rt.equinox.bundles-5e57e66963404eb17d545fbb78cfc6192bb2c1bf.tar.gz rt.equinox.bundles-5e57e66963404eb17d545fbb78cfc6192bb2c1bf.tar.xz rt.equinox.bundles-5e57e66963404eb17d545fbb78cfc6192bb2c1bf.zip | |
Bug 538191 - NPE in SubMonitor.cleanupActiveChildY20180823-0800S4_9_0_M3I20180827-0800I20180826-2000I20180825-1500I20180824-2000I20180823-0450I20180823-0430
Change-Id: I04cc8a9cc6002fc47ac2c89c212550d69f1216e1
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | bundles/org.eclipse.equinox.common/src/org/eclipse/core/runtime/SubMonitor.java | 7 |
1 files 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(); } |