Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2016-05-30 11:16:28 +0000
committerAndrey Loskutov2016-05-30 11:16:28 +0000
commit9f84c3150f3db682acdf40b6d7bbcc347c32836f (patch)
tree0602e68a984be363f95400fa982620cfce302821
parenta560b6da154fd73064a3db715ecc9deb4c640e6a (diff)
downloadegit-9f84c3150f3db682acdf40b6d7bbcc347c32836f.tar.gz
egit-9f84c3150f3db682acdf40b6d7bbcc347c32836f.tar.xz
egit-9f84c3150f3db682acdf40b6d7bbcc347c32836f.zip
Avoid NPE in CommitGraphTable.mapElement()
Bug: 494906 Change-Id: I18953b574d988d377680dd7229b5a4c3bd4220b3 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
index a819c9a362..11d4a75923 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitGraphTable.java
@@ -207,6 +207,9 @@ class CommitGraphTable {
@Override
protected void mapElement(final Object element, final Widget item) {
+ if (element == null) {
+ return;
+ }
((SWTCommit) element).widget = item;
}
};

Back to the top