You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2017/10/23 09:40:32 UTC
svn commit: r1812985 -
/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Author: gnodet
Date: Mon Oct 23 09:40:32 2017
New Revision: 1812985
URL: http://svn.apache.org/viewvc?rev=1812985&view=rev
Log:
[FELIX-5125] Possible NPE
Modified:
felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Modified: felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java?rev=1812985&r1=1812984&r2=1812985&view=diff
==============================================================================
--- felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java (original)
+++ felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java Mon Oct 23 09:40:32 2017
@@ -127,7 +127,7 @@ public class ConfigInstaller implements
configurationEvent.getPid(),
"?");
Dictionary dict = config.getProperties();
- String fileName = (String) dict.get( DirectoryWatcher.FILENAME );
+ String fileName = dict != null ? (String) dict.get( DirectoryWatcher.FILENAME ) : null;
File file = fileName != null ? fromConfigKey(fileName) : null;
if( file != null && file.isFile() ) {
TypedProperties props = new TypedProperties( bundleSubstitution() );