You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/10/29 08:58:24 UTC
svn commit: r1403184 - in
/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config:
ConfigurationEventHandler.java ConfigurationSynchronizer.java
LocalConfigurationListener.java
Author: jbonofre
Date: Mon Oct 29 07:58:23 2012
New Revision: 1403184
URL: http://svn.apache.org/viewvc?rev=1403184&view=rev
Log:
[KARAF-1492] Avoid to attach a config PID to the Cellar config bundle
Modified:
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1403184&r1=1403183&r2=1403184&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java Mon Oct 29 07:58:23 2012
@@ -68,7 +68,7 @@ public class ConfigurationEventHandler e
Configuration conf;
try {
// update the local configuration
- conf = configurationAdmin.getConfiguration(pid);
+ conf = configurationAdmin.getConfiguration(pid, null);
if (conf != null) {
if (event.getType() == ConfigurationEvent.CM_DELETED) {
if (conf.getProperties() != null) {
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java?rev=1403184&r1=1403183&r2=1403184&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationSynchronizer.java Mon Oct 29 07:58:23 2012
@@ -87,7 +87,7 @@ public class ConfigurationSynchronizer e
Properties remoteDictionary = configurationTable.get(pid);
try {
// update the local configuration if needed
- Configuration conf = configurationAdmin.getConfiguration(pid);
+ Configuration conf = configurationAdmin.getConfiguration(pid, null);
remoteDictionary.put(Constants.SYNC_PROPERTY, new Long(System.currentTimeMillis()).toString());
Dictionary localDictionary = conf.getProperties();
if (localDictionary == null)
Modified: karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java?rev=1403184&r1=1403183&r2=1403184&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java (original)
+++ karaf/cellar/branches/cellar-2.3.x/config/src/main/java/org/apache/karaf/cellar/config/LocalConfigurationListener.java Mon Oct 29 07:58:23 2012
@@ -63,7 +63,7 @@ public class LocalConfigurationListener
if (event.getType() != ConfigurationEvent.CM_DELETED) {
Configuration conf = null;
try {
- conf = configurationAdmin.getConfiguration(pid);
+ conf = configurationAdmin.getConfiguration(pid, null);
} catch (Exception e) {
LOGGER.error("CELLAR CONFIG: can't retrieve configuration with PID {}", pid, e);
return;