diff options
| author | Jens Baumgart | 2010-08-11 17:13:21 +0000 |
|---|---|---|
| committer | Jens Baumgart | 2010-08-11 17:13:21 +0000 |
| commit | 5ed46eeed3b15ce8eca4b00651a7411b372639ec (patch) | |
| tree | 354301f104b54ff7bec74ba1a65a15412ac86367 | |
| parent | 96faaecf12d7e42fb2058b583472b4b733e08594 (diff) | |
| download | egit-5ed46eeed3b15ce8eca4b00651a7411b372639ec.tar.gz egit-5ed46eeed3b15ce8eca4b00651a7411b372639ec.tar.xz egit-5ed46eeed3b15ce8eca4b00651a7411b372639ec.zip | |
Make PropertyTester more robust
PropertyTester fails with NPE when the underlying repository is
corrupted. Lots of error popups are shown to the user and the user
cannot remove the corrupted repository from RepositoriesView.
Bug: 318535
Change-Id: Idbe3e064e3746791d4880e17281e241fd63eea7f
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/PropertyTester.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/PropertyTester.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/PropertyTester.java index e6bbca19b1..f6115ea165 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/PropertyTester.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/PropertyTester.java @@ -92,7 +92,10 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester if (property.equals("canMerge")) { //$NON-NLS-1$ Repository rep = node.getRepository(); try { - return rep.getFullBranch().startsWith(Constants.R_HEADS); + String branch = rep.getFullBranch(); + if (branch == null) + return false; // fail gracefully... + return branch.startsWith(Constants.R_HEADS); } catch (IOException e) { return false; } |