Don't store cpu_bitmap unless it is non-NULL

This commit was SVN r31570.

orte/util/nidmap.c

@@ -1140,6 +1140,7 @@ int orte_util_decode_pidmap(opal_byte_object_t *bo)
             }
             OBJ_DESTRUCT(&kv);
 #if OPAL_HAVE_HWLOC
+            if (NULL != cpu_bitmap) {
                 OBJ_CONSTRUCT(&kv, opal_value_t);
                 kv.key = strdup(OPAL_DSTORE_CPUSET);
                 kv.type = OPAL_STRING;
@@ -1151,7 +1152,6 @@ int orte_util_decode_pidmap(opal_byte_object_t *bo)
                     goto cleanup;
                 }
                 OBJ_DESTRUCT(&kv);
-            if (NULL != cpu_bitmap) {
                 free(cpu_bitmap);
             }
 #endif