felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r1812602 - /felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Date Thu, 19 Oct 2017 07:30:19 GMT
Author: gnodet
Date: Thu Oct 19 07:30:18 2017
New Revision: 1812602

URL: http://svn.apache.org/viewvc?rev=1812602&view=rev
Log:
[FELIX-5686] NPE in ConfigInstaller on ConfigDelete

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=1812602&r1=1812601&r2=1812602&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
Thu Oct 19 07:30:18 2017
@@ -183,7 +183,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()) {
                     if (!file.delete()) {



Mime
View raw message