Synchronize BgpPeer.close()

We may be racing with other callbacks, make sure we synchronize. Also
ensure we guard registrations properly.

Change-Id: If6b1e679b91bd2da21d82f0ac81f570c51284f10
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
index cc397952357a52e6665af0d6eb2c0ff9e7420261..187a0385c4997df8be59da916caafae6255f0ca2 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeer.java
@@ -167,13 +167,15 @@ public class BgpPeer implements PeerBean, BGPPeerStateProvider {
     }
 
     @Override
-    public void close() {
+    public synchronized void close() {
         if (this.bgpPeerSingletonService != null) {
-            this.stateProviderRegistration.close();
             this.bgpPeerSingletonService.closeServiceInstance();
-            this.stateProviderRegistration = null;
             this.bgpPeerSingletonService = null;
         }
+        if (this.stateProviderRegistration != null) {
+            this.stateProviderRegistration.close();
+            this.stateProviderRegistration = null;
+        }
     }
 
     @Override