Move the lock initialization back to orte_init so that the finalize lock

is properly initialized and available in all cases (like ompi_info, where
the ess is never actually initialized).  Fixes trac:1364.

This commit was SVN r18733.

The following Trac tickets were found above:
  Ticket 1364 --> https://svn.open-mpi.org/trac/ompi/ticket/1364

orte/mca/ess/base/ess_base_std_prolog.c

@@ -31,7 +31,6 @@
 #include "orte/mca/errmgr/errmgr.h"
 #include "orte/util/show_help.h"
 #include "orte/runtime/orte_wait.h"
-#include "orte/runtime/orte_locks.h"
 #include "orte/runtime/runtime_internals.h"
 
 #include "orte/mca/ess/base/base.h"
@@ -40,12 +39,6 @@ int orte_ess_base_std_prolog(void)
 {
     int ret;
     char *error = NULL;
-
-    /* setup the locks */
-    if (ORTE_SUCCESS != (ret = orte_locks_init())) {
-        error = "orte_locks_init";
-        goto error;
-    }
     
     /* Initialize the ORTE data type support */
     if (ORTE_SUCCESS != (ret = orte_dt_init())) {

orte/runtime/orte_init.c

@@ -41,6 +41,7 @@
 #include "orte/util/proc_info.h"
 
 #include "orte/runtime/runtime.h"
+#include "orte/runtime/orte_locks.h"
 
 /*
  * Whether we have completed orte_init or we are in orte_finalize
@@ -81,6 +82,12 @@ int orte_init(char flags)
     if ((flags & ORTE_TOOL) || (flags & ORTE_TOOL_WITH_NAME)) {
         orte_process_info.tool = true;
     }
+
+    /* setup the locks */
+    if (ORTE_SUCCESS != (ret = orte_locks_init())) {
+        error = "orte_locks_init";
+        goto error;
+    }
     
     if (orte_process_info.hnp) {
         orte_process_info.daemon = false;