felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1812985 - /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Date Mon, 23 Oct 2017 09:40:32 GMT
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() );



Mime
View raw message