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 "Improve performance of XmlElement.getName"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionChainProxy.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
index 11066edd543413de08591102ba2541d7baec9a0f..cf261cbd2af103b70f3dfce9885903a88ee293e6 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java
@@
-8,7
+8,6
@@
package org.opendaylight.controller.cluster.datastore;
package org.opendaylight.controller.cluster.datastore;
-import akka.actor.ActorSelection;
import com.google.common.base.Preconditions;
import java.util.Collections;
import java.util.List;
import com.google.common.base.Preconditions;
import java.util.Collections;
import java.util.List;
@@
-30,7
+29,7
@@
public class TransactionChainProxy implements DOMStoreTransactionChain {
private interface State {
boolean isReady();
private interface State {
boolean isReady();
- List<Future<
ActorSelection
>> getPreviousReadyFutures();
+ List<Future<
Object
>> getPreviousReadyFutures();
}
private static class Allocated implements State {
}
private static class Allocated implements State {
@@
-46,14
+45,14
@@
public class TransactionChainProxy implements DOMStoreTransactionChain {
}
@Override
}
@Override
- public List<Future<
ActorSelection
>> getPreviousReadyFutures() {
+ public List<Future<
Object
>> getPreviousReadyFutures() {
return transaction.getReadyFutures();
}
}
private static abstract class AbstractDefaultState implements State {
@Override
return transaction.getReadyFutures();
}
}
private static abstract class AbstractDefaultState implements State {
@Override
- public List<Future<
ActorSelection
>> getPreviousReadyFutures() {
+ public List<Future<
Object
>> getPreviousReadyFutures() {
return Collections.emptyList();
}
}
return Collections.emptyList();
}
}
@@
-113,7
+112,7
@@
public class TransactionChainProxy implements DOMStoreTransactionChain {
currentState = CLOSED_STATE;
// Send a close transaction chain request to each and every shard
currentState = CLOSED_STATE;
// Send a close transaction chain request to each and every shard
- actorContext.broadcast(new CloseTransactionChain(transactionChainId));
+ actorContext.broadcast(new CloseTransactionChain(transactionChainId)
.toSerializable()
);
}
private ChainedTransactionProxy allocateWriteTransaction(TransactionProxy.TransactionType type) {
}
private ChainedTransactionProxy allocateWriteTransaction(TransactionProxy.TransactionType type) {