Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG 4151 : Create a shared actor system
[controller.git]
/
opendaylight
/
md-sal
/
sal-clustering-commons
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
common
/
actor
/
AbstractConfig.java
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java
index 0f2ac854cebf3735461658b56a4767abb271eb32..1a331b7e99d28216dbad982d36916d1b5fa3d4d0 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/AbstractConfig.java
@@
-11,13
+11,12
@@
package org.opendaylight.controller.cluster.common.actor;
import com.google.common.base.Preconditions;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.google.common.base.Preconditions;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
-
import java.util.HashMap;
import java.util.Map;
public abstract class AbstractConfig implements UnifiedConfig {
import java.util.HashMap;
import java.util.Map;
public abstract class AbstractConfig implements UnifiedConfig {
- private Config config;
+ private
final
Config config;
public AbstractConfig(Config config){
this.config = config;
public AbstractConfig(Config config){
this.config = config;
@@
-45,11
+44,13
@@
public abstract class AbstractConfig implements UnifiedConfig {
return (T)this;
}
return (T)this;
}
- protected Config merge(){
- if (fallback == null)
- fallback = ConfigFactory.load().getConfig(actorSystemName);
+ protected Config merge() {
+ Config config = ConfigFactory.parseMap(configHolder);
+ if (fallback != null) {
+ config = config.withFallback(fallback);
+ }
- return
ConfigFactory.parseMap(configHolder).withFallback(fallback)
;
+ return
config
;
}
}
}
}
}
}