From ac00222a258c837bf60669db2bd03ee06cdf86a0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 28 Oct 2015 20:57:44 +0000 Subject: coverity#1326258 Explicit null dereferenced Change-Id: I58b07353f4dca7fc24305bd0120ed7db18339e83 --- .../org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java | 4 ++-- 1 file 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 +} -- cgit v1.2.3