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/11/05 15:23:33 UTC
svn commit: r1405803 -
/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
Author: jbonofre
Date: Mon Nov 5 14:23:32 2012
New Revision: 1405803
URL: http://svn.apache.org/viewvc?rev=1405803&view=rev
Log:
Checkstyle fix
Modified:
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java?rev=1405803&r1=1405802&r2=1405803&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/ConfigurationEventHandler.java Mon Nov 5 14:23:32 2012
@@ -68,24 +68,24 @@ public class ConfigurationEventHandler e
Configuration conf;
try {
conf = configurationAdmin.getConfiguration(pid, null);
- if (event.getType() == ConfigurationEvent.CM_DELETED) {
- if (conf.getProperties() != null) {
- // delete the properties
- conf.delete();
- deleteStorage(pid);
- }
- } else {
- if (distributedDictionary != null) {
- Dictionary localDictionary = conf.getProperties();
- if (localDictionary == null)
- localDictionary = new Properties();
- localDictionary = filter(localDictionary);
- if (!equals(distributedDictionary, localDictionary)) {
- conf.update(distributedDictionary);
- persistConfiguration(configurationAdmin, pid, distributedDictionary);
- }
+ if (event.getType() == ConfigurationEvent.CM_DELETED) {
+ if (conf.getProperties() != null) {
+ // delete the properties
+ conf.delete();
+ deleteStorage(pid);
+ }
+ } else {
+ if (distributedDictionary != null) {
+ Dictionary localDictionary = conf.getProperties();
+ if (localDictionary == null)
+ localDictionary = new Properties();
+ localDictionary = filter(localDictionary);
+ if (!equals(distributedDictionary, localDictionary)) {
+ conf.update(distributedDictionary);
+ persistConfiguration(configurationAdmin, pid, distributedDictionary);
}
}
+ }
} catch (IOException ex) {
LOGGER.error("CELLAR CONFIG: failed to read remote distributed map", ex);
}