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

feature #523: Minor changes: changed a if test and moved to unlock to error sections

Browse Source
This commit is contained in:
Ruben S. Montero 2011-04-12 17:44:06 +02:00
parent 2ce4009975
commit 2c6e6821ca
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rm/RequestManagerSaveDisk.cc
View File

@ -179,18 +179,17 @@ void RequestManager::VirtualMachineSaveDisk::execute(
rc = vm->xpath(source_img_id, oss.str().c_str(), -1);
oss.str("");
if( rc == 0 ) // The disk was created from an Image
if( rc == 0 ) //The disk was created from an Image
{
source_img = VirtualMachineSaveDisk::ipool->get(source_img_id, true);
if( source_img != 0 ) // The Image still exists
if( source_img != 0 ) //The Image still exists
{
source_img_persistent = source_img->isPersistent();
source_img->unlock();
if( source_img_persistent )
{
vm->unlock();
goto error_img_persistent;
}
}
@ -199,12 +198,10 @@ void RequestManager::VirtualMachineSaveDisk::execute(
//--------------------------------------------------------------------------
// Store image id to save the disk in the VM template
//--------------------------------------------------------------------------
rc = vm->save_disk(disk_id, iid, error_str);
if ( rc == -1 )
{
vm->unlock();
goto error_vm_get_disk_id;
}
@ -238,7 +235,7 @@ error_vm_get:
error_img_persistent:
oss << action_error(method_name, "SAVEDISK", "DISK", disk_id, 0);
oss << " Source IMAGE " << source_img_id << " is persistent.";
vm->unlock();
goto error_common;
error_vm_get_disk_id:
@ -246,6 +243,7 @@ error_vm_get_disk_id:
oss << " " << error_str;
oss << " Deleting Image " << img_name;
imagem->delete_image(iid);
vm->unlock();
goto error_common;
error_user_get:

4
src/vm/VirtualMachine.cc
View File

@ -982,9 +982,9 @@ int VirtualMachine::save_disk(int disk_id, int img_id, string& error_str)
iss.str(disk_id_str);
iss >> tmp_disk_id;
if( tmp_disk_id == disk_id )
if ( tmp_disk_id == disk_id )
{
if( disk->vector_value("SAVE_AS") != "" )
if(!((disk->vector_value("SAVE_AS")).empty()))
{
goto error_saved;
}