summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
index 0fd2320271dc..019beaf97ed4 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/ConverterInfoMgr.java
@@ -410,7 +410,7 @@ public final class ConverterInfoMgr {
} else {
ConverterInfo[] foundInfo = ConverterInfoMgr.findConverterInfoChain(findMimeOne,
findMimeTwo);
- if (foundInfo[0] != null && foundInfo[1] != null ) {
+ if (foundInfo != null && foundInfo[0] != null && foundInfo[1] != null ) {
System.out.println(" Found ConverterInfo Chain");
System.out.println(" DisplayName : " + foundInfo[0].getDisplayName());
System.out.println(" DisplayName : " + foundInfo[1].getDisplayName());