Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21986/src/org/sblim/cimclient/internal/cimxml
Modified Files:
Tag: CIM_CLIENT_2_2_2_M
CIMXMLParserImpl.java
Log Message:
2636 Nested embedded instances cause CIMXMLParseException
Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -d -r1.51 -r1.51.2.1
--- CIMXMLParserImpl.java 9 Mar 2013 12:29:56 -0000 1.51
+++ CIMXMLParserImpl.java 16 May 2013 00:00:13 -0000 1.51.2.1
@@ -58,6 +58,7 @@
* 3572993 2012-10-01 blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
* 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path
* 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
+ * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException
*/
package org.sblim.cimclient.internal.cimxml;
@@ -1211,7 +1212,7 @@
throws CIMXMLParseException {
String name = attribute(pParamE, "NAME");
String referenceClass = attribute(pParamE, "REFERENCECLASS");
- CIMDataType type = new CIMDataType(referenceClass);
+ CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
// QUALIFIER
CIMQualifier<?>[] qualis = parseQUALIFIERS(pParamE);
return new CIMParameter<Object>(name, type, qualis);
@@ -2031,7 +2032,6 @@
if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
String referenceClass = pPropRefE.getAttribute("REFERENCECLASS");
- if (referenceClass != null && referenceClass.length() == 0) referenceClass = null;
String propagatedStr = pPropRefE.getAttribute("PROPAGATED");
boolean propagated = MOF.TRUE.equalsIgnoreCase(propagatedStr);
@@ -2039,7 +2039,7 @@
// QUALIFIER
CIMQualifier<?>[] qualis = parseQUALIFIERS(pPropRefE);
- CIMDataType type = new CIMDataType(referenceClass);
+ CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : "");
// VALUE.REFERENCE
Element valueRefE = (Element) searchFirstNode(pPropRefE, "VALUE.REFERENCE");
Object value = valueRefE != null ? parseVALUEREFERENCE(valueRefE) : null;
|
