admin/one
1
0 Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2026-11-08 21:16:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-1095'

Browse Source 
Conflicts:
	src/pool/PoolObjectSQL.cc
This commit is contained in:
Carlos Martín committed 2012-02-08 07:22:04 -08:00
2 parents 0f1195e336 5cf1b27e2a
commit f736af49e4
9 files changed
+68 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pool/PoolObjectSQL.cc
+1 -15
View File
@@ -169,7 +169,6 @@ void PoolObjectSQL::set_template_error_message(const string& message)
int PoolObjectSQL::replace_template(const string& tmpl_str, string& error)
{
Template * new_tmpl = get_new_template();
char * error_msg = 0;
if ( new_tmpl == 0 )
{
@@ -177,21 +176,8 @@ int PoolObjectSQL::replace_template(const string& tmpl_str, string& error)
return -1;
}
if ( new_tmpl->parse(tmpl_str, &error_msg) != 0 )
if ( new_tmpl->parse_str_or_xml(tmpl_str, error) != 0 )
{
ostringstream oss;
oss << "Parse error";
if (error_msg != 0)
{
oss << ": " << error_msg;
free(error_msg);
}
error = oss.str();
return -1;
}