X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsubscription.go;h=9342ccc3d30378271f4e383f95a5bc088a62e85e;hb=9dc5adc78d459157a42ef8997eeced82a3616f01;hp=52430936817eca32b9df6c5308732c77b736df0e;hpb=f3f4efb9be78f25d3417ecbbce3ea988550e5381;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index 5243093..9342ccc 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -21,7 +21,6 @@ package control
 
 import (
 	"gerrit.o-ran-sc.org/r/ric-plt/e2ap/pkg/e2ap"
-	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/xapptweaks"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	//"reflect"
 	"sync"
@@ -36,7 +35,7 @@ type Subscription struct {
 	registry  *Registry                     // Registry
 	ReqId     RequestId                     // ReqId (Requestor Id + Seq Nro a.k.a subsid)
 	Meid      *xapp.RMRMeid                 // Meid/ RanName
-	EpList    xapptweaks.RmrEndpointList    // Endpoints
+	EpList    xapp.RmrEndpointList          // Endpoints
 	TransLock sync.Mutex                    // Lock transactions, only one executed per time for subs
 	TheTrans  TransactionIf                 // Ongoing transaction
 	SubReqMsg *e2ap.E2APSubscriptionRequest // Subscription information
@@ -44,7 +43,11 @@ type Subscription struct {
 }
 
 func (s *Subscription) String() string {
-	return "subs(" + s.ReqId.String() + "/" + (&xapptweaks.RMRMeid{s.Meid}).String() + "/" + s.EpList.String() + ")"
+	meidstr := "N/A"
+	if s.Meid != nil {
+		meidstr = s.Meid.String()
+	}
+	return "subs(" + s.ReqId.String() + "/" + meidstr + "/" + s.EpList.String() + ")"
 }
 
 func (s *Subscription) GetCachedResponse() (interface{}, bool) {