Merge pull request #820 from IBM/dev-dlherms2

bb:Fix race condition when creating/obtaining a handle for the very s…

bb/src/bbserver.cc

@@ -700,6 +700,7 @@ void msgin_gettransferhandle(txp::Id id, const std::string& pConnectionName, txp
     verifyInitLockState();
 
     uint64_t l_Handle = UNDEFINED_HANDLE;
+    int l_LocalMetadataLocked = 0;
     LVKey l_LVKey;
     LVKey* l_LVKeyPtr = &l_LVKey;
     char lv_uuid_str[LENGTH_UUID_STR] = {'\0'};
@@ -745,6 +746,8 @@ void msgin_gettransferhandle(txp::Id id, const std::string& pConnectionName, txp
 
         switchIds(msg);
 
+        lockLocalMetadata((LVKey*)0, "msgin_gettransferhandle");
+        l_LocalMetadataLocked = 1;
         //  NOTE:  We set up to wait 2 minutes for the necessary LVKey to appear if we can't find
         //         it right away and the handle is not in the cross-bbServer metadata.
         //         This closes the window during activate server between the activation
@@ -841,6 +844,12 @@ void msgin_gettransferhandle(txp::Id id, const std::string& pConnectionName, txp
         LOG_ERROR_RC_WITH_EXCEPTION(__FILE__, __FUNCTION__, __LINE__, e, rc);
     }
 
+    if (l_LocalMetadataLocked)
+    {
+        l_LocalMetadataLocked = 0;
+        unlockLocalMetadata((LVKey*)0, "msgin_gettransferhandle");
+    }
+
     // Build the response message
     txp::Msg* response;
     msg->buildResponseMsg(response);