From 4fc2a2b587fae5c76eed5e475556675c76b5ae1b Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 29 May 2020 18:52:12 +0200
Subject: [PATCH] Fix for f_cse_postamble_deleteResourcesCSE to use
vc_auxiliaryCse2Up flag before accessing vc_cse2
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index a7ec63b..65c28d7 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1539,8 +1539,10 @@ module OneM2M_Functions {
if(vc_ae1.alive) {
f_cse_postamble_ae1();
}
- if(vc_cse2.alive) {
- vc_cse2.stop;
+ if(vc_auxiliaryCse2Up) {
+ if(vc_cse2.alive) {
+ vc_cse2.stop;
+ }
}
};
@@ -2612,7 +2614,7 @@ module OneM2M_Functions {
if(p_resourceType == int10002) {
if(ischosen(p_requestPrimitive.primitiveContent.aEAnnc)) {
if(valueof(p_requestPrimitive.primitiveContent.aEAnnc.link) == "S") {
- p_requestPrimitive.primitiveContent.aEAnnc.link := f_getLocalResourceAddress() & "S";
+ p_requestPrimitive.primitiveContent.aEAnnc.link := f_getLocalResourceAddress() & "/" & "S";
} else {
v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId,omit)), -, int2);
p_requestPrimitive.primitiveContent := f_setLink(valueof(p_requestPrimitive.primitiveContent), f_getLocalResourceAddress(v_originalResourceIndex));
@@ -5284,8 +5286,9 @@ module OneM2M_Functions {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.wsBindingDesc.bindingDesc.localPort);
}
}
+ if(p_announcementTargetResource != "") {
v_poa := v_poa & "/" & p_announcementTargetResource;
-
+ }
return v_poa;
}
--
GitLab