Merge remote-tracking branch 'upstream/next' into OpenMAMA-6.2.2

finos · Jun 21, 2018 · 9df5fce · 9df5fce
2 parents 8e7f91d + 0f792ba
commit 9df5fce
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/mama/c_cpp/src/c/dqstrategyplugin/dqstrategyplugin.c b/mama/c_cpp/src/c/dqstrategyplugin/dqstrategyplugin.c
@@ -382,6 +382,12 @@ dqstrategyMamaPlugin_subscriptionDestroyHook(mamaPluginInfo pluginInfo,
 
     strategy = mamaSubscription_getDqStrategy(subscription);
 
+    /* basic subscriptions will not have a dqStrategy */
+    if (NULL == strategy)
+    {
+        return MAMA_STATUS_OK;
+    }
+
     if (MAMA_STATUS_OK == dqStrategy_destroy(strategy))
     {
         return MAMA_STATUS_OK;

diff --git a/mama/c_cpp/src/c/plugin.c b/mama/c_cpp/src/c/plugin.c
@@ -49,7 +49,6 @@
 
 #define MAX_FUNC_STRING 256
 
-int gNumPlugins        = 0;
 int gCurrentPluginSize = INITIAL_PLUGIN_ARRAY_SIZE;
 /**
  * @brief Mechanism for registering required plugin functions.
@@ -193,6 +192,11 @@ mama_initPlugins(void)
         gPlugins = calloc (INITIAL_PLUGIN_ARRAY_SIZE, sizeof(mamaPluginImpl*));
     }
 
+    if (gPlugins == NULL)
+    {
+        return MAMA_STATUS_NOMEM;
+    }
+
     properties_ForEach (mamaInternal_getProperties(), pluginPropertiesCb, NULL);
 
 #ifdef WITH_ENTERPRISE
@@ -305,6 +309,18 @@ mama_loadPlugin (const char* pluginName)
             return status;
         }
 
+        /* Resize the gPlugins array for the new plugin */
+        if((gPluginNo + 1) > gCurrentPluginSize)
+        {
+            gCurrentPluginSize += 1;
+            gPlugins = (mamaPluginImpl**) realloc (gPlugins,  sizeof(mamaPluginImpl*) * gCurrentPluginSize);
+
+            if (gPlugins == NULL)
+            {
+                return MAMA_STATUS_NOMEM;
+            }
+        }
+
         /* Save off the plugin impl and increment the plugin counter */
         gPlugins[gPluginNo] = aPluginImpl;
         gPluginNo++;
@@ -511,7 +527,7 @@ mamaPlugin_fireSubscriptionDestroyHook (mamaSubscription subscription)
     {
         if (gPlugins[plugin] != NULL)
         {
-            if (gPlugins[plugin]->mamaPluginSubscriptionPreMsgHook != NULL)
+            if (gPlugins[plugin]->mamaPluginSubscriptionDestroyHook != NULL)
             {
                 status = gPlugins[plugin]->mamaPluginSubscriptionDestroyHook (gPlugins[plugin]->mPluginInfo, subscription);
 
@@ -579,16 +595,8 @@ static void pluginPropertiesCb(const char* name, const char* value, void* closur
     {
         if(strstr(name, PLUGIN_PROPERTY) != NULL)
         {
-            gNumPlugins++;
-            if(gNumPlugins > gCurrentPluginSize)
-            {
-                gCurrentPluginSize *= 2;
-                gPlugins = (mamaPluginImpl**) realloc (gPlugins,  sizeof(mamaPluginImpl*) * gCurrentPluginSize);
-            }
-
             mama_log (MAMA_LOG_LEVEL_FINE, "mama_initPlugins(): Initialising %s", value);
             mama_loadPlugin (value);
-
         }
     }
 }