X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fregistry.go;fp=pkg%2Fcontrol%2Fregistry.go;h=f9e1bccb72ec5c5955a3c95ac2a488e185871f22;hb=9c4697fa22fae79ac923e72f417ecbebf1c1e4d6;hp=29d82a9220447caadcd708d26ce87d86175cb5bb;hpb=2a08dd799ad0de2ec84f7dd32ef5a1c3974e2575;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index 29d82a9..f9e1bcc 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -530,7 +530,9 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 	if waitRouteClean > 0 {
 		// Wait here that response is delivered to xApp via RMR before route is cleaned
 		xapp.Logger.Debug("Pending %v in order to wait route cleanup", waitRouteClean)
+		r.mutex.Unlock()
 		time.Sleep(waitRouteClean)
+		r.mutex.Lock()
 	}
 
 	xapp.Logger.Debug("CLEAN %s", subs.String())
@@ -567,7 +569,10 @@ func (r *Registry) RemoveFromSubscription(subs *Subscription, trans *Transaction
 
 		// Endpoint of merged subscription is being deleted
 		xapp.Logger.Debug("Subscription route update WriteSubscriptionToDb")
-		c.WriteSubscriptionToDb(subs)
+		err := c.WriteSubscriptionToDb(subs)
+		if err != nil {
+			xapp.Logger.Error("tracker.UnTrackTransaction() failed:%s", err.Error())
+		}
 		c.UpdateCounter(cUnmergedSubscriptions)
 	}
 	return nil