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 2018/04/19 17:53:26 UTC
svn commit: r1829585 -
/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Author: gnodet
Date: Thu Apr 19 17:53:25 2018
New Revision: 1829585
URL: http://svn.apache.org/viewvc?rev=1829585&view=rev
Log:
[FELIX-5832] Only handle ConfigurationEvents for config objects managed by us
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=1829585&r1=1829584&r2=1829585&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 Apr 19 17:53:25 2018
@@ -150,7 +150,7 @@ public class ConfigInstaller implements
Dictionary dict = config.getProperties();
String fileName = dict != null ? (String) dict.get( DirectoryWatcher.FILENAME ) : null;
File file = fileName != null ? fromConfigKey(fileName) : null;
- if( file != null && file.isFile() ) {
+ if( file != null && file.isFile() && canHandle( file ) ) {
pidToFile.put(config.getPid(), fileName);
TypedProperties props = new TypedProperties( bundleSubstitution() );
try (Reader r = new InputStreamReader(new FileInputStream(file), encoding()))