Create DatastoreSnapshotRestore instance via blueprint

[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 5908a869776cabf1fc1910b88e4ffb0f34cfe37d..52ab3030bff528b4d44027e58757e0d5d3a63e26 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
@@ -35,24 +35,16 @@ public class DatastoreSnapshotRestore {
     private final String restoreDirectoryPath;
     private final Map<String, DatastoreSnapshot> datastoreSnapshots = new ConcurrentHashMap<>();
 
     private final String restoreDirectoryPath;
     private final Map<String, DatastoreSnapshot> datastoreSnapshots = new ConcurrentHashMap<>();
 

-    public static void createInstance(String restoreDirectoryPath) {
+    public static DatastoreSnapshotRestore instance(String restoreDirectoryPath) {

         instance.compareAndSet(null, new DatastoreSnapshotRestore(restoreDirectoryPath));
         instance.compareAndSet(null, new DatastoreSnapshotRestore(restoreDirectoryPath));

-    }
-
-    public static void removeInstance() {
-        instance.set(null);
-    }
-
-    public static DatastoreSnapshotRestore instance() {
-        DatastoreSnapshotRestore localInstance = instance.get();
-        return Preconditions.checkNotNull(localInstance, "DatastoreSnapshotRestore instance was not created");
+        return instance.get();

     }
 
     private DatastoreSnapshotRestore(String restoreDirectoryPath) {
         this.restoreDirectoryPath = Preconditions.checkNotNull(restoreDirectoryPath);
     }
 
     }
 
     private DatastoreSnapshotRestore(String restoreDirectoryPath) {
         this.restoreDirectoryPath = Preconditions.checkNotNull(restoreDirectoryPath);
     }
 

-    // sychronize this method so that, in case of concurrent access to getAndRemove(),
+    // synchronize this method so that, in case of concurrent access to getAndRemove(),

     // no one ends up with partially initialized data
     private synchronized void initialize() {
 
     // no one ends up with partially initialized data
     private synchronized void initialize() {