Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Clean up TransactionProxy a bit
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionProxy.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
index 019b0dbebe20c18f964b6f8c5f0f385bf59d3a76..b4934e7e62a449cdc5b3789f9551426c9944836c 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
@@
-104,7
+104,7
@@
public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
requireNonNull(path, "path should not be null");
LOG.trace("Tx {} read {}", getIdentifier(), path);
requireNonNull(path, "path should not be null");
LOG.trace("Tx {} read {}", getIdentifier(), path);
- return path.isEmpty() ? readAllData() :
singleShardRead(shardNameFromIdentifier(path), path);
+ return path.isEmpty() ? readAllData() : singleShardRead(shardNameFromIdentifier(path), path);
}
private FluentFuture<Optional<NormalizedNode<?, ?>>> singleShardRead(
}
private FluentFuture<Optional<NormalizedNode<?, ?>>> singleShardRead(
@@
-175,9
+175,8
@@
public class TransactionProxy extends AbstractDOMStoreTransaction<TransactionIde
if (state == TransactionState.OPEN) {
state = newState;
return true;
if (state == TransactionState.OPEN) {
state = newState;
return true;
- } else {
- return false;
}
}
+ return false;
}
@Override
}
@Override