mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-22 18:50:08 +03:00
Fixes compilation issues and bug in saveas image method
This commit is contained in:
parent
75d01c2584
commit
8777194aa2
@ -57,6 +57,7 @@ void RequestManager::VirtualMachinePoolInfo::execute(
|
||||
break;
|
||||
default:
|
||||
paramList.verifyEnd(4);
|
||||
return;
|
||||
}
|
||||
|
||||
// Get the parameters
|
||||
|
@ -149,14 +149,11 @@ error_vm_get_disk_id:
|
||||
|
||||
error_authenticate:
|
||||
oss.str(authenticate_error(method_name));
|
||||
goto error_common_lock;
|
||||
goto error_common;
|
||||
|
||||
error_authorize:
|
||||
oss.str(authorization_error(method_name, "MANAGE", "VM/IMAGE", rc, vm_id));
|
||||
goto error_common_lock;
|
||||
|
||||
error_common_lock:
|
||||
vm->unlock();
|
||||
goto error_common;
|
||||
|
||||
error_common:
|
||||
arrayData.push_back(xmlrpc_c::value_boolean(false));
|
||||
|
@ -171,7 +171,11 @@ void VirtualMachineManager::do_action(const string &action, void * arg)
|
||||
if ( arg == 0)
|
||||
{
|
||||
if ( action != ACTION_TIMER && action != ACTION_FINALIZE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
vid = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user