diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-10-28 20:57:44 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-28 20:57:44 +0000 |
commit | ac00222a258c837bf60669db2bd03ee06cdf86a0 (patch) | |
tree | ee395296fbb178251d09e195d6b4f77bce347c8b /xmerge | |
parent | 4a0a89f2ee602394f3b67437eb047ace33f2ada6 (diff) |
coverity#1326258 Explicit null dereferenced
Change-Id: I58b07353f4dca7fc24305bd0120ed7db18339e83
Diffstat (limited to 'xmerge')
-rw-r--r-- | xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git 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 index cb7167b1e090..67432ac1163b 100644 --- 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 +} |