You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2011/02/18 08:48:49 UTC
svn commit: r1071908 -
/felix/trunk/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/ConfigInstaller.java
Author: cziegeler
Date: Fri Feb 18 07:48:49 2011
New Revision: 1071908
URL: http://svn.apache.org/viewvc?rev=1071908&view=rev
Log:
FELIX-2848 : Saving config file to original location shouldn't add system properties. Applying patch from Carl Hall
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=1071908&r1=1071907&r2=1071908&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 Fri Feb 18 07:48:49 2011
@@ -136,9 +136,20 @@ public class ConfigInstaller implements
else if( fileName.endsWith( ".config" ) )
{
OutputStream fos = new FileOutputStream( file );
+ Properties props = new Properties();
+ for( Enumeration e = dict.keys(); e.hasMoreElements(); )
+ {
+ String key = e.nextElement().toString();
+ if( !Constants.SERVICE_PID.equals(key)
+ && !ConfigurationAdmin.SERVICE_FACTORYPID.equals(key)
+ && !DirectoryWatcher.FILENAME.equals(key) )
+ {
+ props.put( key, dict.get( key ) );
+ }
+ }
try
{
- ConfigurationHandler.write( fos, dict );
+ ConfigurationHandler.write( fos, props );
}
finally
{