bug #4662: Do not double unlock on deploy/migrate operations

OpenNebula · Aug 1, 2016 · 61a2464 · 61a2464
1 parent 66e4ea1
commit 61a2464
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/src/dm/DispatchManagerActions.cc b/src/dm/DispatchManagerActions.cc
@@ -57,17 +57,13 @@ int DispatchManager::deploy (
         goto error;
     }
 
-    vm->unlock();
-
     return 0;
 
 error:
-
     oss.str("");
     oss << "Could not deploy VM " << vid << ", wrong state.";
     NebulaLog::log("DiM",Log::ERROR,oss);
 
-    vm->unlock();
     return -1;
 }
 
@@ -115,8 +111,6 @@ int DispatchManager::import (
 
     vmpool->update_history(vm);
 
-    vm->unlock();
-
     return 0;
 }
 
@@ -152,16 +146,13 @@ int DispatchManager::migrate(
         goto error;
     }
 
-    vm->unlock();
-
     return 0;
 
 error:
     oss.str("");
     oss << "Could not migrate VM " << vid << ", wrong state.";
     NebulaLog::log("DiM",Log::ERROR,oss);
 
-    vm->unlock();
     return -1;
 }
 
@@ -194,16 +185,13 @@ int DispatchManager::live_migrate(
         goto error;
     }
 
-    vm->unlock();
-
     return 0;
 
 error:
     oss.str("");
     oss << "Could not live-migrate VM " << vid << ", wrong state.";
     NebulaLog::log("DiM",Log::ERROR,oss);
 
-    vm->unlock();
     return -1;
 }