shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

bug: Fix deadlock when deleting the same object multiple times

Browse Source 
(cherry picked from commit 2ca77fb8450a4a191ec9c0776d716a10cf7f9bf9)
This commit is contained in:
Ruben S. Montero 2012-03-29 19:17:30 +02:00
parent 5faea03dcd
commit 04effc5058
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/image/ImageManagerActions.cc
View File

@ -296,6 +296,7 @@ int ImageManager::delete_image(int iid, const string& ds_data)
if ( imd == 0 )
{
img->unlock();
return -1;
}

2
src/pool/PoolSQL.cc
View File

@ -187,6 +187,7 @@ PoolObjectSQL * PoolSQL::get(
if ( objectsql->isValid() == false )
{
objectsql->unlock();
objectsql = 0;
}
}
@ -276,7 +277,6 @@ PoolObjectSQL * PoolSQL::get(const string& name, int ouid, bool olock)
if ( objectsql->isValid() == false )
{
objectsql->unlock();
objectsql = 0;
}
}