Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2016-05-23 20:31:04 +0000
committerMatthias Sohn2016-05-24 23:45:02 +0000
commit253cfab6051fc7837a2212f88c98b91702a98f0d (patch)
treea15691119eebaac284d7e2c4d0ffa08a3845f584
parent3421a454f2b378c43322387f1d7ebd735972c645 (diff)
downloadegit-253cfab6051fc7837a2212f88c98b91702a98f0d.tar.gz
egit-253cfab6051fc7837a2212f88c98b91702a98f0d.tar.xz
egit-253cfab6051fc7837a2212f88c98b91702a98f0d.zip
Fix NPE in AbstractRebaseCommandHandler$1.done()
Bug: 494349 Change-Id: Iab252c60b1e963b10aaf83940726fff1955b9fa3 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java
index 2ce74e4528..f33dd63ff3 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/AbstractRebaseCommandHandler.java
@@ -99,6 +99,9 @@ public abstract class AbstractRebaseCommandHandler extends AbstractSharedCommand
public void done(IJobChangeEvent cevent) {
finishRebaseInteractive();
IStatus result = cevent.getJob().getResult();
+ if (result == null) {
+ return;
+ }
// if a rebase was started, returned with an exception
// and left the repository in an unsafe state, try to
// abort and show exception

Back to the top