diff options
| author | Ian Bull | 2011-06-27 06:18:14 +0000 |
|---|---|---|
| committer | Chris Aniszczyk | 2011-06-27 19:02:58 +0000 |
| commit | ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9 (patch) | |
| tree | 49eeeffff0921c2c823737724a42b56ffee9e12b | |
| parent | 28a98e601a5af64a2a47c886c53acf66f22ff5fb (diff) | |
| download | egit-ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9.tar.gz egit-ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9.tar.xz egit-ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9.zip | |
Fixed an NPE in the reflog view
Bug: 350394
Change-Id: Ic56806ec08c57fe330fe6dac1df440225229a50e
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java index 9e9b18ffd9..1514a07e58 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/reflog/ReflogView.java @@ -267,16 +267,19 @@ public class ReflogView extends ViewPart { if (adapted != null) { RepositoryMapping mapping = RepositoryMapping .getMapping(adapted); - repository = mapping.getRepository(); + if (mapping != null) { + repository = mapping.getRepository(); + } } } else if (ssel.getFirstElement() instanceof RepositoryTreeNode) { RepositoryTreeNode repoNode = (RepositoryTreeNode) ssel .getFirstElement(); repository = repoNode.getRepository(); } + if (repository != null) { - reflogTableViewer.setInput(repository); form.setText(getRepositoryName(repository)); + reflogTableViewer.setInput(repository); } } } |