1 files changed, 20 insertions, 13 deletions

diff --git a/ndb/src/ndbapi/ObjectMap.hpp b/ndb/src/ndbapi/ObjectMap.hpp
index 21407279f0b..c730d1ce6b1 100644
--- a/ndb/src/ndbapi/ObjectMap.hpp
+++ b/ndb/src/ndbapi/ObjectMap.hpp
@@ -30,7 +30,7 @@ class NdbObjectIdMap //: NdbLockable
 {
 public:
   STATIC_CONST( InvalidId = ~(Uint32)0 );
-  NdbObjectIdMap(Uint32 initalSize = 128, Uint32 expandSize = 10);
+  NdbObjectIdMap(NdbMutex*, Uint32 initalSize = 128, Uint32 expandSize = 10);
   ~NdbObjectIdMap();
 
   Uint32 map(void * object);
@@ -46,14 +46,16 @@ private:
      void * m_obj;
   } * m_map;
 
+  NdbMutex * m_mutex;
   void expand(Uint32 newSize);
 };
 
 inline
-NdbObjectIdMap::NdbObjectIdMap(Uint32 sz, Uint32 eSz) {
+NdbObjectIdMap::NdbObjectIdMap(NdbMutex* mutex, Uint32 sz, Uint32 eSz) {
   m_size = 0;
   m_firstFree = InvalidId;
   m_map = 0;
+  m_mutex = mutex;
   m_expandSize = eSz;
   expand(sz);
 #ifdef DEBUG_OBJECTMAP
@@ -131,21 +133,26 @@ NdbObjectIdMap::getObject(Uint32 id){
 
 inline void
 NdbObjectIdMap::expand(Uint32 incSize){
+  NdbMutex_Lock(m_mutex);
   Uint32 newSize = m_size + incSize;
-  MapEntry * tmp = (MapEntry*)malloc(newSize * sizeof(MapEntry));
+  MapEntry * tmp = (MapEntry*)realloc(m_map, newSize * sizeof(MapEntry));
 
-  if (m_map) {
-    memcpy(tmp, m_map, m_size * sizeof(MapEntry));
-    free((void*)m_map);
+  if (likely(tmp != 0))
+  {
+    m_map = tmp;
+    
+    for(Uint32 i = m_size; i<newSize; i++){
+      m_map[i].m_next = i + 1;
+    }
+    m_firstFree = m_size;
+    m_map[newSize-1].m_next = InvalidId;
+    m_size = newSize;
   }
-  m_map = tmp;
-
-  for(Uint32 i = m_size; i<newSize; i++){
-    m_map[i].m_next = i + 1;
+  else
+  {
+    ndbout_c("NdbObjectIdMap::expand unable to expand!!");
   }
-  m_firstFree = m_size;
-  m_map[newSize-1].m_next = InvalidId;
-  m_size = newSize;
+  NdbMutex_Unlock(m_mutex);
 }
 
 #endif