aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Bull2011-06-27 02:18:14 (EDT)
committerChris Aniszczyk2011-06-27 15:02:58 (EDT)
commitddbd9e9f4cda94c8134a9e2e275853d0d5038ff9 (patch)
tree49eeeffff0921c2c823737724a42b56ffee9e12b
parent28a98e601a5af64a2a47c886c53acf66f22ff5fb (diff)
downloadegit-ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9.zip
egit-ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9.tar.gz
egit-ddbd9e9f4cda94c8134a9e2e275853d0d5038ff9.tar.bz2
Fixed an NPE in the reflog viewrefs/changes/82/3782/2
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.java7
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 9e9b18f..1514a07 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);
}
}
}