Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Slice front-end request messages
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
DatastoreSnapshotRestore.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
index 87c88179dc2e9f2ebd38d7ec58365209a7b45233..e29de0f13f976840b0f90f1cb540bda08351eb76 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
@@
-16,8
+16,8
@@
import java.io.ObjectInputStream;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicReference;
-import org.opendaylight.controller.cluster.datastore.
messages
.DatastoreSnapshot;
-import org.opendaylight.controller.cluster.datastore.
messages
.DatastoreSnapshotList;
+import org.opendaylight.controller.cluster.datastore.
persisted
.DatastoreSnapshot;
+import org.opendaylight.controller.cluster.datastore.
persisted
.DatastoreSnapshotList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-75,7
+75,7
@@
public class DatastoreSnapshotRestore {
for (DatastoreSnapshot snapshot: snapshots) {
datastoreSnapshots.put(snapshot.getType(), snapshot);
}
for (DatastoreSnapshot snapshot: snapshots) {
datastoreSnapshots.put(snapshot.getType(), snapshot);
}
- } catch (Exception e) {
+ } catch (
ClassNotFoundException | IO
Exception e) {
LOG.error("Error reading clustered datastore restore file {}", restoreFile, e);
} finally {
if (!restoreFile.delete()) {
LOG.error("Error reading clustered datastore restore file {}", restoreFile, e);
} finally {
if (!restoreFile.delete()) {