version 1.36, 2003/03/13 23:09:55
|
version 1.37, 2003/03/20 00:29:46
|
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMCreateClassResponseMessage( | return(new CIMCreateClassResponseMessage( |
messageId, | messageId, |
|
|
QueueIdStack(), | QueueIdStack(), |
CIMClass())); | CIMClass())); |
} | } |
else if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
else if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
{ | { |
CIMClass cimClass; | CIMClass cimClass; |
| |
if (!XmlReader::getClassElement(parser, cimClass)) |
if ((entry.type == XmlEntry::EMPTY_TAG) || |
|
!XmlReader::getClassElement(parser, cimClass)) |
|
{ |
throw XmlValidationError(parser.getLine(),"expected CLASS element"); | throw XmlValidationError(parser.getLine(),"expected CLASS element"); |
|
} |
| |
XmlReader::testEndTag(parser, "IRETURNVALUE"); |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
| |
return(new CIMGetClassResponseMessage( | return(new CIMGetClassResponseMessage( |
messageId, | messageId, |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMModifyClassResponseMessage( | return(new CIMModifyClassResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMName> classNames; | Array<CIMName> classNames; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMName className; | CIMName className; |
| |
|
|
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMEnumerateClassNamesResponseMessage( | return(new CIMEnumerateClassNamesResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMClass> cimClasses; | Array<CIMClass> cimClasses; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMClass cimClass; | CIMClass cimClass; |
| |
|
|
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMEnumerateClassesResponseMessage( | return(new CIMEnumerateClassesResponseMessage( |
messageId, | messageId, |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMDeleteClassResponseMessage( | return(new CIMDeleteClassResponseMessage( |
messageId, | messageId, |
|
|
CIMObjectPath instanceName; | CIMObjectPath instanceName; |
XmlReader::getInstanceNameElement(parser, instanceName); | XmlReader::getInstanceNameElement(parser, instanceName); |
| |
XmlReader::testEndTag(parser, "IRETURNVALUE"); |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
| |
return(new CIMCreateInstanceResponseMessage( | return(new CIMCreateInstanceResponseMessage( |
messageId, | messageId, |
|
|
QueueIdStack(), | QueueIdStack(), |
CIMInstance())); | CIMInstance())); |
} | } |
else if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
else if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
{ | { |
CIMInstance cimInstance; | CIMInstance cimInstance; |
| |
if (!XmlReader::getInstanceElement(parser, cimInstance)) |
if ((entry.type == XmlEntry::EMPTY_TAG) || |
|
!XmlReader::getInstanceElement(parser, cimInstance)) |
{ | { |
throw XmlValidationError( | throw XmlValidationError( |
parser.getLine(), "expected INSTANCE element"); | parser.getLine(), "expected INSTANCE element"); |
} | } |
| |
XmlReader::testEndTag(parser, "IRETURNVALUE"); |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
| |
return(new CIMGetInstanceResponseMessage( | return(new CIMGetInstanceResponseMessage( |
messageId, | messageId, |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMModifyInstanceResponseMessage( | return(new CIMModifyInstanceResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMObjectPath> instanceNames; | Array<CIMObjectPath> instanceNames; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
String className; | String className; |
Array<CIMKeyBinding> keyBindings; | Array<CIMKeyBinding> keyBindings; |
|
|
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMEnumerateInstanceNamesResponseMessage( | return(new CIMEnumerateInstanceNamesResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMInstance> namedInstances; | Array<CIMInstance> namedInstances; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMInstance namedInstance; | CIMInstance namedInstance; |
| |
while (XmlReader::getNamedInstanceElement(parser, namedInstance)) |
while (XmlReader::getNamedInstanceElement( |
|
parser, namedInstance)) |
|
{ |
namedInstances.append(namedInstance); | namedInstances.append(namedInstance); |
|
} |
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMEnumerateInstancesResponseMessage( | return(new CIMEnumerateInstancesResponseMessage( |
messageId, | messageId, |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMDeleteInstanceResponseMessage( | return(new CIMDeleteInstanceResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
CIMValue cimValue(CIMTYPE_STRING, false); | CIMValue cimValue(CIMTYPE_STRING, false); |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
if (!XmlReader::getPropertyValue(parser, cimValue)) | if (!XmlReader::getPropertyValue(parser, cimValue)) |
{ | { |
|
|
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
else | else |
{ | { |
// No value given; just return a null String value | // No value given; just return a null String value |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMSetPropertyResponseMessage( | return(new CIMSetPropertyResponseMessage( |
messageId, | messageId, |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMSetQualifierResponseMessage( | return(new CIMSetQualifierResponseMessage( |
messageId, | messageId, |
|
|
CIMQualifierDecl qualifierDecl; | CIMQualifierDecl qualifierDecl; |
XmlReader::getQualifierDeclElement(parser, qualifierDecl); | XmlReader::getQualifierDeclElement(parser, qualifierDecl); |
| |
XmlReader::testEndTag(parser, "IRETURNVALUE"); |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
| |
return(new CIMGetQualifierResponseMessage( | return(new CIMGetQualifierResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMQualifierDecl> qualifierDecls; | Array<CIMQualifierDecl> qualifierDecls; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMQualifierDecl qualifierDecl; | CIMQualifierDecl qualifierDecl; |
| |
while (XmlReader::getQualifierDeclElement(parser, qualifierDecl)) |
while (XmlReader::getQualifierDeclElement( |
|
parser, qualifierDecl)) |
|
{ |
qualifierDecls.append(qualifierDecl); | qualifierDecls.append(qualifierDecl); |
|
} |
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMEnumerateQualifiersResponseMessage( | return(new CIMEnumerateQualifiersResponseMessage( |
messageId, | messageId, |
|
|
} | } |
else | else |
{ | { |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMDeleteQualifierResponseMessage( | return(new CIMDeleteQualifierResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMObjectPath> objectPaths; | Array<CIMObjectPath> objectPaths; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMObjectPath objectPath; | CIMObjectPath objectPath; |
| |
|
|
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMReferenceNamesResponseMessage( | return(new CIMReferenceNamesResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMObject> objectWithPathArray; | Array<CIMObject> objectWithPathArray; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMObject objectWithPath; | CIMObject objectWithPath; |
| |
while (XmlReader::getValueObjectWithPathElement(parser, objectWithPath)) |
while (XmlReader::getValueObjectWithPathElement( |
|
parser, objectWithPath)) |
|
{ |
objectWithPathArray.append(objectWithPath); | objectWithPathArray.append(objectWithPath); |
|
} |
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMReferencesResponseMessage( | return(new CIMReferencesResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMObjectPath> objectPaths; | Array<CIMObjectPath> objectPaths; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMObjectPath objectPath; | CIMObjectPath objectPath; |
| |
|
|
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMAssociatorNamesResponseMessage( | return(new CIMAssociatorNamesResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMObject> objectWithPathArray; | Array<CIMObject> objectWithPathArray; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
CIMObject objectWithPath; | CIMObject objectWithPath; |
| |
while (XmlReader::getValueObjectWithPathElement(parser, objectWithPath)) |
while (XmlReader::getValueObjectWithPathElement( |
|
parser, objectWithPath)) |
|
{ |
objectWithPathArray.append(objectWithPath); | objectWithPathArray.append(objectWithPath); |
|
} |
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMAssociatorsResponseMessage( | return(new CIMAssociatorsResponseMessage( |
messageId, | messageId, |
|
|
{ | { |
Array<CIMObject> objectWithPathArray; | Array<CIMObject> objectWithPathArray; |
| |
if (XmlReader::testStartTag(parser, entry, "IRETURNVALUE")) |
if (XmlReader::testStartTagOrEmptyTag(parser, entry, "IRETURNVALUE")) |
|
{ |
|
if (entry.type != XmlEntry::EMPTY_TAG) |
{ | { |
XmlReader::getObjectArray(parser, objectWithPathArray); | XmlReader::getObjectArray(parser, objectWithPathArray); |
| |
XmlReader::expectEndTag(parser, "IRETURNVALUE"); | XmlReader::expectEndTag(parser, "IRETURNVALUE"); |
} | } |
|
} |
| |
return(new CIMExecQueryResponseMessage( | return(new CIMExecQueryResponseMessage( |
messageId, | messageId, |