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 509: Added support for merge operation to InMemoryData Store
[controller.git]
/
opendaylight
/
md-sal
/
sal-binding-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
binding
/
impl
/
AbstractForwardedTransaction.java
diff --git
a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java
b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java
index 6334457fd4961ae34d913fb9138a8313f6eb30b1..6bd6e6aaf52294ed0ada1b2809995ea1b7877260 100644
(file)
--- a/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java
+++ b/
opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java
@@
-132,7
+132,7
@@
public class AbstractForwardedTransaction<T extends AsyncTransaction<org.openday
}
if (!d.isPresent() && iterator.hasNext()) {
}
if (!d.isPresent() && iterator.hasNext()) {
- writeTransaction.
put
(store, currentPath, currentOp.createDefault(currentArg));
+ writeTransaction.
merge
(store, currentPath, currentOp.createDefault(currentArg));
}
}
//LOG .info("Tx: {} : Putting data {}",getDelegate().getIdentifier(),normalized.getKey());
}
}
//LOG .info("Tx: {} : Putting data {}",getDelegate().getIdentifier(),normalized.getKey());