Bug 516644 - [regression] NPE in
org.eclipse.team.internal.ui.history.CompareFileRevisionEditorInput.getResource(ICompareInput)
Fix NPE in CompareFileRevisionEditorInput
Accidentally introduced in 30ce23c898392ba97114d8ba7cf5eddd7a0d6373.
A null check is still necessary.
Change-Id: Iac381eea4a17f67bd7cbe9b6289643ecd35377cb
Signed-off-by: Sebastian Ratz <sebastian.ratz@sap.com>
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java
index 6360fff..aaaa464 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/history/CompareFileRevisionEditorInput.java
@@ -150,7 +150,11 @@
}
private IResource getResource(ICompareInput input) {
- return getLocalElement().getResource();
+ LocalResourceTypedElement localElement = getLocalElement();
+ if (localElement != null) {
+ return localElement.getResource();
+ }
+ return null;
}
private ICompareInput createCompareInput() {
