Fix NPE in CompareTreeView.reactOnOpen

Bug: 388816
Change-Id: I40b704b61e0abd976bed7c7f5c77b731f18b2d19
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>

1 files changed, 12 insertions, 8 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
index e0826c8148..ea1c42ef3b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CompareTreeView.java
@@ -262,7 +262,7 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
 		} else if (selected instanceof PathNode) {
 			PathNode node = (PathNode) selected;
 			String encoding = CompareCoreUtils.getResourceEncoding(
-					repositoryMapping.getRepository(), node.getRepoRelativePath());
+					getRepository(), node.getRepoRelativePath());
 			switch (node.type) {
 			case FILE_BOTH_SIDES_DIFFER:
 				// fall through
@@ -315,7 +315,7 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
 			GitFileRevision rightRevision = compareVersionMap
 					.get(node.pathNode.path);
 			String encoding = CompareCoreUtils.getResourceEncoding(
-					repositoryMapping.getRepository(), node.pathNode.getRepoRelativePath());
+					getRepository(), node.pathNode.getRepoRelativePath());
 			right = new FileRevisionTypedElement(rightRevision, encoding);
 			left = new GitCompareFileRevisionEditorInput.EmptyTypedElement(NLS
 					.bind(UIText.CompareTreeView_ItemNotFoundInVersionMessage,
@@ -1227,16 +1227,20 @@ public class CompareTreeView extends ViewPart implements IMenuListener, IShowInS
 	}
 
 	private IPath getRepositoryPath() {
-		Repository repo = null;
-		if (repositoryMapping != null)
-			repo = repositoryMapping.getRepository();
-		else if (input instanceof Repository)
-			repo = (Repository) input;
-
+		Repository repo = getRepository();
 		if (repo != null)
 			return new Path(repo.getWorkTree().getAbsolutePath());
 
 		return null;
 	}
 
+	private Repository getRepository() {
+		if (repositoryMapping != null)
+			return repositoryMapping.getRepository();
+		else if (input instanceof Repository)
+			return (Repository) input;
+
+		return null;
+	}
+
 }