More of the same + fixed a functest that missed some REGEX

FIWARE · May 15, 2023 · fb99288 · fb99288
1 parent ea687e1
commit fb99288
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/src/lib/mongoBackend/mongoSubCache.cpp b/src/lib/mongoBackend/mongoSubCache.cpp
@@ -303,10 +303,18 @@ int mongoSubCacheItemInsert(const char* tenant, const BSONObj& sub)
   // IP, port and rest
   cSubP->url = strdup(cSubP->httpInfo.url.c_str());
   urlParse(cSubP->url, &cSubP->protocolString, &cSubP->ip, &cSubP->port, &cSubP->rest);
-  cSubP->protocol = protocolFromString(cSubP->protocolString);
-  cSubP->protocolString = strdup(cSubP->protocolString);
-  cSubP->rest           = strdup(cSubP->rest);
-  cSubP->ip             = strdup(cSubP->ip);
+
+  if (cSubP->protocolString != NULL)
+  {
+    cSubP->protocol = protocolFromString(cSubP->protocolString);
+    cSubP->protocolString = strdup(cSubP->protocolString);
+  }
+
+  if (cSubP->rest != NULL)
+    cSubP->rest = strdup(cSubP->rest);
+
+  if (cSubP->ip != NULL)
+    cSubP->ip = strdup(cSubP->ip);
 
   // q
   cSubP->qText = sub.hasField("ldQ")? strdup(getStringFieldF(&sub, "ldQ")) : NULL;

diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_patch_geoq.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_patch_geoq.test
@@ -212,9 +212,9 @@ Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld>; rel="http:/
 
 03. See S1 in DB
 ================
-MongoDB shell version v4.4.21
-connecting to: mongodb://localhost:27017/ftest?compressors=disabled&gssapiServiceName=mongodb
-MongoDB server version: 4.4.21
+MongoDB shell version REGEX(.*)
+connecting to: REGEX(.*)
+MongoDB server version: REGEX(.*)
 {
 	"_id" : "urn:S1",
 	"entities" : [
@@ -337,9 +337,9 @@ Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld>; rel="http:/
 
 07. See S1 in DB
 ================
-MongoDB shell version v4.4.21
-connecting to: mongodb://localhost:27017/ftest?compressors=disabled&gssapiServiceName=mongodb
-MongoDB server version: 4.4.21
+MongoDB shell version REGEX(.*)
+connecting to: REGEX(.*)
+MongoDB server version: REGEX(.*)
 {
 	"_id" : "urn:S1",
 	"entities" : [
@@ -462,9 +462,9 @@ Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld>; rel="http:/
 
 11. See S1 in DB
 ================
-MongoDB shell version v4.4.21
-connecting to: mongodb://localhost:27017/ftest?compressors=disabled&gssapiServiceName=mongodb
-MongoDB server version: 4.4.21
+MongoDB shell version REGEX(.*)
+connecting to: REGEX(.*)
+MongoDB server version: REGEX(.*)
 {
 	"_id" : "urn:S1",
 	"entities" : [