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-5280: synchronize access to local histories
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
AbstractShardDataTreeTransaction.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java
index dd8ec0b12ab30f3a947ac1d795347772cd119e0d..222280cf3b0ade880f0486c56f2517dfb90b0620 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java
@@
-10,6
+10,8
@@
package org.opendaylight.controller.cluster.datastore;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import javax.annotation.concurrent.NotThreadSafe;
import com.google.common.base.MoreObjects;
import com.google.common.base.Preconditions;
import javax.annotation.concurrent.NotThreadSafe;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
+import org.opendaylight.yangtools.concepts.Identifiable;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
/**
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
/**
@@
-18,16
+20,23
@@
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
* @param <T> Backing transaction type.
*/
@NotThreadSafe
* @param <T> Backing transaction type.
*/
@NotThreadSafe
-abstract class AbstractShardDataTreeTransaction<T extends DataTreeSnapshot> {
+abstract class AbstractShardDataTreeTransaction<T extends DataTreeSnapshot>
+ implements Identifiable<TransactionIdentifier> {
+ private final TransactionIdentifier id;
private final T snapshot;
private final T snapshot;
- private final String id;
+
private boolean closed;
private boolean closed;
-
protected AbstractShardDataTreeTransaction(final String
id, final T snapshot) {
+
AbstractShardDataTreeTransaction(final TransactionIdentifier
id, final T snapshot) {
this.snapshot = Preconditions.checkNotNull(snapshot);
this.id = Preconditions.checkNotNull(id);
}
this.snapshot = Preconditions.checkNotNull(snapshot);
this.id = Preconditions.checkNotNull(id);
}
+ @Override
+ public final TransactionIdentifier getIdentifier() {
+ return id;
+ }
+
final T getSnapshot() {
return snapshot;
}
final T getSnapshot() {
return snapshot;
}
@@
-52,7
+61,8
@@
abstract class AbstractShardDataTreeTransaction<T extends DataTreeSnapshot> {
@Override
public final String toString() {
@Override
public final String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("closed", closed).add("snapshot", snapshot).toString();
+ return MoreObjects.toStringHelper(this).add("id", id).add("closed", closed).add("snapshot", snapshot)
+ .toString();
}
abstract void abort();
}
abstract void abort();