Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20417/src/org/sblim/cimclient/internal/cimxml
Modified Files:
Tag: Experimental
CIMXMLParserImpl.java
Log Message:
2700 PROPERTY does not require TYPE attribute
Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.65
retrieving revision 1.14.2.66
diff -u -d -r1.14.2.65 -r1.14.2.66
--- CIMXMLParserImpl.java 6 Nov 2013 02:35:25 -0000 1.14.2.65
+++ CIMXMLParserImpl.java 7 Nov 2013 19:08:37 -0000 1.14.2.66
@@ -81,6 +81,7 @@
* 2695 2013-10-25 blaschke-oss parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
* 2696 2013-10-29 blaschke-oss parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
* 2699 2013-11-05 blaschke-oss parseQUALIFIER does not require TYPE attribute
+ * 2700 2013-11-07 blaschke-oss PROPERTY does not require TYPE attribute
*/
package org.sblim.cimclient.internal.cimxml;
@@ -2022,6 +2023,8 @@
if (property_nameA == null) throw new CIMXMLParseException(
"PROPERTY element missing NAME attribute!");
String name = property_nameA.getNodeValue();
+ if (attribute(pPropertyE, "TYPE") == null && !hasTypeAttrsInNodes(pPropertyE)) throw new CIMXMLParseException(
+ "PROPERTY element missing TYPE attribute!");
String classOrigin = pPropertyE.getAttribute("CLASSORIGIN");
if (classOrigin != null && classOrigin.length() == 0) classOrigin = null;
@@ -3159,7 +3162,9 @@
String name = n.getNodeName();
if ("VALUE".equalsIgnoreCase(name) || "VALUE.ARRAY".equalsIgnoreCase(name)) {
NamedNodeMap nm = n.getAttributes();
- if (nm != null && nm.getNamedItem("TYPE") != null) return true;
+ if (nm != null
+ && (nm.getNamedItem("TYPE") != null || nm.getNamedItem("PARAMTYPE") != null)) return true;
+
}
}
return false;
|
