diff --git a/src/rm/Request.cc b/src/rm/Request.cc index 1ae7152711..a204af1e4a 100644 --- a/src/rm/Request.cc +++ b/src/rm/Request.cc @@ -231,7 +231,7 @@ string Request::request_error (const string &err_desc, const string &err_detail) if (!err_detail.empty()) { - oss << err_detail; + oss << ". " << err_detail; } return oss.str(); diff --git a/src/rm/RequestManagerPoolInfoFilter.cc b/src/rm/RequestManagerPoolInfoFilter.cc index 5ea66b36d4..88a4fe2647 100644 --- a/src/rm/RequestManagerPoolInfoFilter.cc +++ b/src/rm/RequestManagerPoolInfoFilter.cc @@ -40,7 +40,7 @@ void RequestManagerPoolInfoFilter::request_execute(xmlrpc_c::paramList const& pa if ( filter_flag < MINE ) { - failure_response(XML_RPC_API, request_error("Incorrect filter_flag.","")); + failure_response(XML_RPC_API, request_error("Incorrect filter_flag","")); return; } diff --git a/src/rm/RequestManagerVirtualMachine.cc b/src/rm/RequestManagerVirtualMachine.cc index ab4062784c..988bc9cb43 100644 --- a/src/rm/RequestManagerVirtualMachine.cc +++ b/src/rm/RequestManagerVirtualMachine.cc @@ -374,6 +374,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis int rc; ostringstream oss; string error_str; + char * error_char; // ------------------ Template for the new image ------------------ @@ -383,7 +384,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis itemplate = new ImageTemplate; - itemplate->parse(oss.str(),0); + itemplate->parse(oss.str(), &error_char); // ------------------ Authorize the operation ------------------ @@ -423,7 +424,7 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis if ( rc == 0 ) { pool->update(vm); - }; + } vm->unlock(); @@ -442,8 +443,8 @@ void VirtualMachineSaveDisk::request_execute(xmlrpc_c::paramList const& paramLis return; } - - success_response(id); + // Return the new allocated Image ID + success_response(iid); } /* -------------------------------------------------------------------------- */ diff --git a/src/rm/RequestManagerVirtualNetwork.cc b/src/rm/RequestManagerVirtualNetwork.cc index dd09f8f6ec..f716ba6554 100644 --- a/src/rm/RequestManagerVirtualNetwork.cc +++ b/src/rm/RequestManagerVirtualNetwork.cc @@ -34,7 +34,7 @@ string RequestManagerVirtualNetwork::leases_error (char *error) free(error); } - return request_error("Error modifiying network leases.",oss.str()); + return request_error("Error modifiying network leases",oss.str()); } /* ------------------------------------------------------------------------- */ @@ -79,7 +79,7 @@ void RequestManagerVirtualNetwork:: if ( rc < 0 ) { failure_response(INTERNAL, - request_error("Error modifiying network leases.",error_str)); + request_error("Error modifiying network leases",error_str)); vn->unlock(); return;