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 "Startup archetype: Add basic unit tests for impl."
[controller.git]
/
opendaylight
/
netconf
/
mdsal-netconf-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
netconf
/
mdsal
/
connector
/
ops
/
get
/
GetConfig.java
diff --git
a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/get/GetConfig.java
b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/get/GetConfig.java
index b56bcc795caf3ad1c5adacaa98d445e1b63079a8..f2d8abbb6180f10785f7cb00c59dcb6d6fd7d5ee 100644
(file)
--- a/
opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/get/GetConfig.java
+++ b/
opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/controller/netconf/mdsal/connector/ops/get/GetConfig.java
@@
-9,6
+9,7
@@
package org.opendaylight.controller.netconf.mdsal.connector.ops.get;
import com.google.common.base.Optional;
package org.opendaylight.controller.netconf.mdsal.connector.ops.get;
import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
@@
-52,10
+53,13
@@
public class GetConfig extends AbstractGet {
}
final YangInstanceIdentifier dataRoot = ROOT;
}
final YangInstanceIdentifier dataRoot = ROOT;
- DOMDataReadWriteTransaction rwTx = getTransaction(getConfigExecution.getDatastore());
+ // Proper exception should be thrown
+ Preconditions.checkState(getConfigExecution.getDatastore().isPresent(), "Source element missing from request");
+
+ DOMDataReadWriteTransaction rwTx = getTransaction(getConfigExecution.getDatastore().get());
try {
final Optional<NormalizedNode<?, ?>> normalizedNodeOptional = rwTx.read(LogicalDatastoreType.CONFIGURATION, dataRoot).checkedGet();
try {
final Optional<NormalizedNode<?, ?>> normalizedNodeOptional = rwTx.read(LogicalDatastoreType.CONFIGURATION, dataRoot).checkedGet();
- if (getConfigExecution.getDatastore() == Datastore.running) {
+ if (getConfigExecution.getDatastore()
.get()
== Datastore.running) {
transactionProvider.abortRunningTransaction(rwTx);
rwTx = null;
}
transactionProvider.abortRunningTransaction(rwTx);
rwTx = null;
}