version 1.127, 2007/09/07 18:40:14
|
version 1.128, 2007/10/17 20:38:06
|
|
|
objectName.set(String(), CIMNamespaceName(), className); | objectName.set(String(), CIMNamespaceName(), className); |
return true; | return true; |
} | } |
else if (getInstanceNameElement(parser, objectName)) |
|
return true; |
if (!getInstanceNameElement(parser, objectName)) |
else |
|
{ | { |
MessageLoaderParms mlParms( | MessageLoaderParms mlParms( |
"Common.XmlReader.EXPECTED_CLASSNAME_OR_INSTANCENAME_ELEMENT", | "Common.XmlReader.EXPECTED_CLASSNAME_OR_INSTANCENAME_ELEMENT", |
|
|
throw XmlValidationError(parser.getLine(), mlParms); | throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
| |
PEGASUS_UNREACHABLE( return false; ) |
return true; |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |
|
|
if (!testStartTag(parser, entry, "OBJECTPATH")) | if (!testStartTag(parser, entry, "OBJECTPATH")) |
return false; | return false; |
| |
if (getClassPathElement(parser, objectPath)) |
if (!getClassPathElement(parser, objectPath) && |
{ |
!getInstancePathElement(parser, objectPath)) |
expectEndTag(parser, "OBJECTPATH"); |
|
return true; |
|
} |
|
else if (getInstancePathElement(parser, objectPath)) |
|
{ |
|
expectEndTag(parser, "OBJECTPATH"); |
|
return true; |
|
} |
|
else |
|
{ | { |
MessageLoaderParms mlParms( | MessageLoaderParms mlParms( |
"Common.XmlReader.EXPECTED_INSTANCEPATH_OR_CLASSPATH_ELEMENT", | "Common.XmlReader.EXPECTED_INSTANCEPATH_OR_CLASSPATH_ELEMENT", |
|
|
throw XmlValidationError(parser.getLine(), mlParms); | throw XmlValidationError(parser.getLine(), mlParms); |
} | } |
| |
PEGASUS_UNREACHABLE(return false;) |
expectEndTag(parser, "OBJECTPATH"); |
|
return true; |
} | } |
| |
//------------------------------------------------------------------------------ | //------------------------------------------------------------------------------ |