From d00d0e63f1beb4e0e378e99a846a0ebefd53a46b Mon Sep 17 00:00:00 2001
From: Andre Weinand
Date: Wed, 6 Feb 2002 12:08:58 +0000
Subject: fix for NPE in StructureDiffViewer.contentsEqual

---
 .../org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java   | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bundles/org.eclipse.compare/compare/org')

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
index 8b691ef93..58f6065b7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java
@@ -311,6 +311,8 @@ public class StructureDiffViewer extends DiffTreeViewer {
 			boolean ignoreWhiteSpace= Utilities.getBoolean(getCompareConfiguration(), CompareConfiguration.IGNORE_WHITESPACE, false);		
 			String s1= fStructureCreator.getContents(o1, ignoreWhiteSpace);
 			String s2= fStructureCreator.getContents(o2, ignoreWhiteSpace);
+			if (s1 == null || s2 == null)
+				return false;
 			return s1.equals(s2);
 		}
 		return false;
-- 
cgit v1.2.3