Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixed Group and meter id bugs"
[controller.git]
/
opendaylight
/
md-sal
/
sal-common-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
common
/
impl
/
service
/
AbstractDataBroker.xtend
diff --git
a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
index da47438a6bb4a282045bb3fe44cd15863b9c3b03..32e59b869e20de484e4f1c27028698e1d8b05a49 100644
(file)
--- a/
opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
+++ b/
opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/service/AbstractDataBroker.xtend
@@
-345,10
+345,19
@@
public abstract class AbstractDataTransaction<P extends Path<P>, D> extends Abst
}
\r
\r
override readConfigurationData(P path) {
\r
}
\r
\r
override readConfigurationData(P path) {
\r
+ val local = this.updatedConfigurationData.get(path);
\r
+ if(local != null) {
\r
+ return local;
\r
+ }
\r
+
\r
return broker.readConfigurationData(path);
\r
}
\r
\r
override readOperationalData(P path) {
\r
return broker.readConfigurationData(path);
\r
}
\r
\r
override readOperationalData(P path) {
\r
+ val local = this.updatedOperationalData.get(path);
\r
+ if(local != null) {
\r
+ return local;
\r
+ }
\r
return broker.readOperationalData(path);
\r
}
\r
\r
return broker.readOperationalData(path);
\r
}
\r
\r