Code Review
/
mdsal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix InMemory shard transaction chaining.
[mdsal.git]
/
dom
/
mdsal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
mdsal
/
dom
/
broker
/
ShardedDOMDataTreeWriteTransaction.java
diff --git
a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java
b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java
index 24b640501f01cc0bc48d28483070f48e0b384a42..b2deac6179fa5562a384439562f5a5d7244fb0bf 100644
(file)
--- a/
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java
+++ b/
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java
@@
-24,6
+24,7
@@
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiConsumer;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiConsumer;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.GuardedBy;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.GuardedBy;
@@
-133,7
+134,7
@@
final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware
}
CheckedFuture<Void, TransactionCommitFailedException> doSubmit(
}
CheckedFuture<Void, TransactionCommitFailedException> doSubmit(
-
BiConsumer<ShardedDOMDataTreeWriteTransaction, Void
> success,
+
Consumer<ShardedDOMDataTreeWriteTransaction
> success,
BiConsumer<ShardedDOMDataTreeWriteTransaction, Throwable> failure) {
final Set<DOMDataTreeShardWriteTransaction> txns = ImmutableSet.copyOf(idToTransaction.values());
BiConsumer<ShardedDOMDataTreeWriteTransaction, Throwable> failure) {
final Set<DOMDataTreeShardWriteTransaction> txns = ImmutableSet.copyOf(idToTransaction.values());
@@
-148,14
+149,14
@@
final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware
Futures.addCallback(listListenableFuture, new FutureCallback<List<Void>>() {
@Override
public void onSuccess(final List<Void> result) {
Futures.addCallback(listListenableFuture, new FutureCallback<List<Void>>() {
@Override
public void onSuccess(final List<Void> result) {
+ success.accept(ShardedDOMDataTreeWriteTransaction.this);
ret.set(null);
ret.set(null);
- success.accept(ShardedDOMDataTreeWriteTransaction.this, null);
}
@Override
public void onFailure(final Throwable exp) {
}
@Override
public void onFailure(final Throwable exp) {
- ret.setException(exp);
failure.accept(ShardedDOMDataTreeWriteTransaction.this, exp);
failure.accept(ShardedDOMDataTreeWriteTransaction.this, exp);
+ ret.setException(exp);
}
});
}
});