X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fsubscription.go;h=b2516bd505c662d70529976306bc21b9399ee087;hb=aada64566a3a77cf9a20a98f9ddd7cd6f37529ae;hp=ac68aa616d3d00f67eb4ead42e0102842823024c;hpb=7348625b9ef03d41dd5a0ca0f6c508376259717e;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/subscription.go b/pkg/control/subscription.go
index ac68aa6..b2516bd 100644
--- a/pkg/control/subscription.go
+++ b/pkg/control/subscription.go
@@ -23,6 +23,7 @@ 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"
 )
 
@@ -150,11 +151,11 @@ func (s *Subscription) IsMergeable(trans *TransactionXapp, subReqMsg *e2ap.E2APS
 				return false
 			}
 
-			if acts.ActionDefinition.Present != actt.ActionDefinition.Present ||
-				acts.ActionDefinition.StyleId != actt.ActionDefinition.StyleId ||
-				acts.ActionDefinition.ParamId != actt.ActionDefinition.ParamId {
+			if acts.RicActionDefinitionPresent != actt.RicActionDefinitionPresent ||
+				reflect.DeepEqual(acts.ActionDefinitionChoice, actt.ActionDefinitionChoice) == false {
 				return false
 			}
+
 			if acts.SubsequentAction.Present != actt.SubsequentAction.Present ||
 				acts.SubsequentAction.Type != actt.SubsequentAction.Type ||
 				acts.SubsequentAction.TimetoWait != actt.SubsequentAction.TimetoWait {