coverity#1326258 Explicit null dereferenced

Change-Id: I58b07353f4dca7fc24305bd0120ed7db18339e83

coverity#1326258 Explicit null dereferenced
Change-Id: I58b07353f4dca7fc24305bd0120ed7db18339e83
ac00222a · Caolán McNamara · 4a0a89f2 · ac00222a
Kaydet (Commit) ac00222a authored Eki 28, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

PluginFactoryImpl.java ...enoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java +2 -3

No files found.
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
@@ -140,7 +140,7 @@ public final class PluginFactoryImpl extends PluginFactory
        try {
            props.load(is);

-            String info = props.getProperty(mimeType);
+            String info = mimeType != null ? props.getProperty(mimeType) : null;
            if (info != null) {
                ext = info;
            }
@@ -171,4 +171,4 @@ public final class PluginFactoryImpl extends PluginFactory
        DocumentMergerImpl merger = new DocumentMergerImpl(doc, cc);
        return merger;
    }
-}
\ No newline at end of file
+}