Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Correct Frontend{Client,History}Metadata deserialization
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
RemoteTransactionContextSupport.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
index 7be72393a2caff1918cd1f8e75bc392feab5290a..333d11b4f05ce03e4bca41e1f7727dc5e31fe279 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java
@@
-14,6
+14,7
@@
import akka.actor.ActorSelection;
import akka.dispatch.OnComplete;
import akka.pattern.AskTimeoutException;
import akka.util.Timeout;
import akka.dispatch.OnComplete;
import akka.pattern.AskTimeoutException;
import akka.util.Timeout;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.util.concurrent.TimeUnit;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
import java.util.concurrent.TimeUnit;
import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
@@
-34,7
+35,7
@@
import scala.concurrent.duration.FiniteDuration;
* <p/>
* The end result from a completed CreateTransaction message is a TransactionContext that is
* used to perform transaction operations. Transaction operations that occur before the
* <p/>
* The end result from a completed CreateTransaction message is a TransactionContext that is
* used to perform transaction operations. Transaction operations that occur before the
- * CreateTransaction completes are cache
via a
TransactionContextWrapper and executed once the
+ * CreateTransaction completes are cache
d via a Delayed
TransactionContextWrapper and executed once the
* CreateTransaction completes, successfully or not.
*/
final class RemoteTransactionContextSupport {
* CreateTransaction completes, successfully or not.
*/
final class RemoteTransactionContextSupport {
@@
-58,9
+59,9
@@
final class RemoteTransactionContextSupport {
private final Timeout createTxMessageTimeout;
private final Timeout createTxMessageTimeout;
- private final TransactionContextWrapper transactionContextWrapper;
+ private final
Delayed
TransactionContextWrapper transactionContextWrapper;
- RemoteTransactionContextSupport(final TransactionContextWrapper transactionContextWrapper,
+ RemoteTransactionContextSupport(final
Delayed
TransactionContextWrapper transactionContextWrapper,
final TransactionProxy parent, final String shardName) {
this.parent = requireNonNull(parent);
this.shardName = shardName;
final TransactionProxy parent, final String shardName) {
this.parent = requireNonNull(parent);
this.shardName = shardName;
@@
-151,6
+152,8
@@
final class RemoteTransactionContextSupport {
}, getActorUtils().getClientDispatcher());
}
}, getActorUtils().getClientDispatcher());
}
+ @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+ justification = "https://github.com/spotbugs/spotbugs/issues/811")
private void onFindPrimaryShardComplete(final Throwable failure, final PrimaryShardInfo newPrimaryShardInfo) {
if (failure == null) {
this.primaryShardInfo = newPrimaryShardInfo;
private void onFindPrimaryShardComplete(final Throwable failure, final PrimaryShardInfo newPrimaryShardInfo) {
if (failure == null) {
this.primaryShardInfo = newPrimaryShardInfo;
@@
-228,7
+231,6
@@
final class RemoteTransactionContextSupport {
localTransactionContext = new NoOpTransactionContext(exception, getIdentifier());
}
localTransactionContext = new NoOpTransactionContext(exception, getIdentifier());
}
-
transactionContextWrapper.executePriorTransactionOperations(localTransactionContext);
}
transactionContextWrapper.executePriorTransactionOperations(localTransactionContext);
}