diff options
author | Pascal Rapicault | 2013-04-25 01:16:14 +0000 |
---|---|---|
committer | Pascal Rapicault | 2013-04-25 01:16:14 +0000 |
commit | ddc5f7e7d8f44002de4b8d72ceef7e5a5599b5a2 (patch) | |
tree | 4ffa965e56276919b41b1da3795df547ca7d4cbe | |
parent | 7fed21c3bf0ed0e83eab0032437955434ebcfa5a (diff) | |
download | rt.equinox.p2-ddc5f7e7d8f44002de4b8d72ceef7e5a5599b5a2.tar.gz rt.equinox.p2-ddc5f7e7d8f44002de4b8d72ceef7e5a5599b5a2.tar.xz rt.equinox.p2-ddc5f7e7d8f44002de4b8d72ceef7e5a5599b5a2.zip |
NPE when cancelling while the remediation is being computed
-rw-r--r-- | bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java index b05ae813a..b72e52050 100644 --- a/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java +++ b/bundles/org.eclipse.equinox.p2.operations/src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java @@ -143,6 +143,8 @@ public abstract class ProfileChangeOperation implements IProfileChangeJob { SubMonitor mon = SubMonitor.convert(monitor, Messages.ProfileChangeOperation_ResolveTaskName, 1000); prepareToResolve(); makeResolveJob(mon.newChild(100)); + if (mon.isCanceled()) + return null; job.setAdditionalProgressMonitor(mon.newChild(900)); return job; } |