Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-02-06 07:08:58 -0500
committerAndre Weinand2002-02-06 07:08:58 -0500
commitd00d0e63f1beb4e0e378e99a846a0ebefd53a46b (patch)
tree562ac65725abb84338e9ca6b2e2076f5e807c776 /bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer
parent38db1aa614df8d54186bcc1cdf4e4145a0643d27 (diff)
downloadeclipse.platform.team-d00d0e63f1beb4e0e378e99a846a0ebefd53a46b.tar.gz
eclipse.platform.team-d00d0e63f1beb4e0e378e99a846a0ebefd53a46b.tar.xz
eclipse.platform.team-d00d0e63f1beb4e0e378e99a846a0ebefd53a46b.zip
fix for NPE in StructureDiffViewer.contentsEqual
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/structuremergeviewer/StructureDiffViewer.java2
1 files changed, 2 insertions, 0 deletions
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;

Back to the top