Bump odlparent to 5.0.0

[netconf.git] / netconf / netconf-topology-singleton / src / main / java / org / opendaylight / netconf / topology / singleton / impl / NetconfNodeManager.java

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManager.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManager.java
index b4b5eb31c85735fa2d7fa7ec7988156b0c88214e..61eb8e9e21f68408e3d52d2ead3ef0e2654b7b67 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManager.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManager.java
@@ -15,7 +15,8 @@ import akka.pattern.AskTimeoutException;
 import akka.pattern.Patterns;
 import akka.util.Timeout;
 import java.util.Collection;
-import javax.annotation.concurrent.GuardedBy;
+import org.checkerframework.checker.lock.qual.GuardedBy;
+import org.checkerframework.checker.lock.qual.Holding;
 import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
@@ -126,7 +127,7 @@ class NetconfNodeManager
         }
     }
 
-    @GuardedBy("this")
+    @Holding("this")
     private void closeActor() {
         if (slaveActorRef != null) {
             LOG.debug("{}: Sending poison pill to {}", id, slaveActorRef);
@@ -178,7 +179,7 @@ class NetconfNodeManager
         }
     }
 
-    @GuardedBy("this")
+    @Holding("this")
     private void sendAskForMasterMountPointWithRetries(final AskForMasterMountPoint askForMasterMountPoint,
             final ActorSelection masterActor, final int tries, final int updateCount) {
         final Future<Object> future = Patterns.ask(masterActor, askForMasterMountPoint, actorResponseWaitTime);
@@ -208,7 +209,7 @@ class NetconfNodeManager
         }, setup.getActorSystem().dispatcher());
     }
 
-    @GuardedBy("this")
+    @Holding("this")
     private void createOrUpdateActorRef() {
         if (slaveActorRef == null) {
             slaveActorRef = setup.getActorSystem().actorOf(NetconfNodeActor.props(setup, id, schemaRegistry,