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 2018/02/16 11:33:14 UTC
svn commit: r1824450 -
/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
Author: cziegeler
Date: Fri Feb 16 11:33:14 2018
New Revision: 1824450
URL: http://svn.apache.org/viewvc?rev=1824450&view=rev
Log:
FELIX-5290 : [R7] Locking Configuration Records
Modified:
felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
Modified: felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java?rev=1824450&r1=1824449&r2=1824450&view=diff
==============================================================================
--- felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java (original)
+++ felix/trunk/osgi-r7/configadmin/src/main/java/org/apache/felix/cm/impl/ConfigurationImpl.java Fri Feb 16 11:33:14 2018
@@ -557,7 +557,10 @@ public class ConfigurationImpl
{
props.put(PROPERTY_LOCKED, this.locked);
}
-
+ else
+ {
+ props.remove(PROPERTY_LOCKED);
+ }
// only store now, if this is not a new configuration
persistenceManager.store( getPidString(), props );
}
@@ -663,6 +666,7 @@ public class ConfigurationImpl
{
properties.remove( ConfigurationAdmin.SERVICE_BUNDLELOCATION );
}
+ properties.remove( PROPERTY_LOCKED );
}
@@ -671,6 +675,7 @@ public class ConfigurationImpl
replaceProperty( properties, Constants.SERVICE_PID, pid );
replaceProperty( properties, ConfigurationAdmin.SERVICE_FACTORYPID, factoryPid );
properties.remove( ConfigurationAdmin.SERVICE_BUNDLELOCATION );
+ properties.remove( PROPERTY_LOCKED );
}