Shift the check for adequate file descriptors to after we check if this proc is part of the job to be launched - no point in doing the check more often than absolutely required

This commit was SVN r21406.

orte/mca/odls/base/odls_base_default_fns.c

@@ -1217,6 +1217,21 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
                 continue;
             }
             
+            /* do we have a child from the specified job. Because the
+             * job could be given as a WILDCARD value, we must use
+             * the dss.compare function to check for equality.
+             */
+            if (OPAL_EQUAL != opal_dss.compare(&job, &(child->name->jobid), ORTE_JOBID)) {
+                
+                OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output,
+                                     "%s odls:launch child %s is not in job %s being launched",
+                                     ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
+                                     ORTE_NAME_PRINT(child->name),
+                                     ORTE_JOBID_PRINT(job)));
+                
+                continue;
+            }
+            
             /* check to see if we have enough available file descriptors
              * to launch another child - if not, then let's wait a little
              * while to see if some come free. This can happen if we are
@@ -1259,21 +1274,6 @@ int orte_odls_base_default_launch_local(orte_jobid_t job,
                     }
                 }
             }
-             
-            /* do we have a child from the specified job. Because the
-             * job could be given as a WILDCARD value, we must use
-             * the dss.compare function to check for equality.
-             */
-            if (OPAL_EQUAL != opal_dss.compare(&job, &(child->name->jobid), ORTE_JOBID)) {
-                
-                OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output,
-                                     "%s odls:launch child %s is not in job %s being launched",
-                                     ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
-                                     ORTE_NAME_PRINT(child->name),
-                                     ORTE_JOBID_PRINT(job)));
-                
-                continue;
-            }
             
             /* did the user request we display output in xterms? */
             if (NULL != orte_xterm) {