If it's not the HNP, release the cluster object first and return.

This commit was SVN r18247.

orte/mca/plm/ccp/plm_ccp_component.c

@@ -26,12 +26,12 @@
 #include "orte/mca/plm/base/base.h"
 #include "orte/mca/plm/base/plm_private.h"
 #include "plm_ccp.h"
-
+
-/* Import the Windows CCP API. */
+/* Import the Windows CCP API. */
-#import "ccpapi.tlb" named_guids no_namespace raw_interfaces_only   \
+#import "ccpapi.tlb" named_guids no_namespace raw_interfaces_only   \
-    rename("SetEnvironmentVariable","SetEnvVar")                    \
+    rename("SetEnvironmentVariable","SetEnvVar")                    \
-    rename("GetJob", "GetSingleJob")                                \
+    rename("GetJob", "GetSingleJob")                                \
-    rename("AddJob", "AddSingleJob")
+    rename("AddJob", "AddSingleJob")
 
 
 /*
@@ -133,26 +133,27 @@ static int plm_ccp_close(void)
 
 static orte_plm_base_module_t *plm_ccp_init(int *priority)
 {
-    int rc;
+    int rc;
-    ICluster* pCluster = NULL;
+    ICluster* pCluster = NULL;
-    HRESULT hr = S_OK;
+    HRESULT hr = S_OK;
 
-    /* CCP is not thread safe. Use the apartment model. */
+    /* CCP is not thread safe. Use the apartment model. */
-    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-
+
-    /* Try to create the Cluster object. */
+    /* Try to create the Cluster object. */
-    hr = CoCreateInstance( __uuidof(Cluster),
+    hr = CoCreateInstance( __uuidof(Cluster),
-                           NULL,
+                           NULL,
-                           CLSCTX_INPROC_SERVER,
+                           CLSCTX_INPROC_SERVER,
-                           __uuidof(ICluster),
+                           __uuidof(ICluster),
-                           reinterpret_cast<void **> (&pCluster) );
+                           reinterpret_cast<void **> (&pCluster) );
-    if (FAILED(hr)) {
+    if (FAILED(hr)) {
-        /* We are not Windows clusters, don't select us.*/
+        /* We are not Windows clusters, don't select us.*/
-        return NULL;
+        return NULL;
-    }
+    }
 
     /* if we are NOT an HNP, then don't select us */
     if (!orte_process_info.hnp) {
+        pCluster->Release();
         return NULL;
     }
 

orte/mca/ras/ccp/ras_ccp_component.c

@@ -21,12 +21,12 @@
 #include "orte/util/proc_info.h"
 #include "ras_ccp.h"
 
-
+
-/* Import the Windows CCP API. */
+/* Import the Windows CCP API. */
-#import "ccpapi.tlb" named_guids no_namespace raw_interfaces_only   \
+#import "ccpapi.tlb" named_guids no_namespace raw_interfaces_only   \
-    rename("SetEnvironmentVariable","SetEnvVar")                    \
+    rename("SetEnvironmentVariable","SetEnvVar")                    \
-    rename("GetJob", "GetSingleJob")                                \
+    rename("GetJob", "GetSingleJob")                                \
-    rename("AddJob", "AddSingleJob")
+    rename("AddJob", "AddSingleJob")
 
 
 /*
@@ -90,26 +90,27 @@ static int ras_ccp_open(void)
 
 static orte_ras_base_module_t *ras_ccp_init(int* priority)
 {
-    int rc;
+    int rc;
-    ICluster* pCluster = NULL;
+    ICluster* pCluster = NULL;
-    HRESULT hr = S_OK;
+    HRESULT hr = S_OK;
 
-    /* CCP is not thread safe. Use the apartment model. */
+    /* CCP is not thread safe. Use the apartment model. */
-    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-
+
-    /* Try to create the Cluster object. */
+    /* Try to create the Cluster object. */
-    hr = CoCreateInstance( __uuidof(Cluster),
+    hr = CoCreateInstance( __uuidof(Cluster),
-                           NULL,
+                           NULL,
-                           CLSCTX_INPROC_SERVER,
+                           CLSCTX_INPROC_SERVER,
-                           __uuidof(ICluster),
+                           __uuidof(ICluster),
-                           reinterpret_cast<void **> (&pCluster) );
+                           reinterpret_cast<void **> (&pCluster) );
-    if (FAILED(hr)) {
+    if (FAILED(hr)) {
-        /* We are not Windows clusters, don't select us.*/
+        /* We are not Windows clusters, don't select us.*/
-        return NULL;
+        return NULL;
     }
 
     /* if we are NOT an HNP, then don't select us */
     if (!orte_process_info.hnp) {
+        pCluster->Release();
         return NULL;
     }