Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19599/src/org/sblim/cimclient/internal/cimxml
Modified Files:
Tag: Experimental
CIMXMLParserImpl.java
Log Message:
2694 NAME attribute not required by DOM parser (part 2)
Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.61
retrieving revision 1.14.2.62
diff -u -d -r1.14.2.61 -r1.14.2.62
--- CIMXMLParserImpl.java 18 Oct 2013 18:40:18 -0000 1.14.2.61
+++ CIMXMLParserImpl.java 25 Oct 2013 15:02:24 -0000 1.14.2.62
@@ -77,6 +77,7 @@
* 2688 2013-10-10 blaschke-oss parseMETHODCALL looks for CIMName attribute instead of NAME
* 2537 2013-10-17 blaschke-oss Add new data types for PARAMVALUE
* 2691 2013-10-18 blaschke-oss RETURNVALUE should not require PARAMTYPE attribute
+ * 2694 2013-10-25 blaschke-oss NAME attribute not required by DOM parser (part 2)
*/
package org.sblim.cimclient.internal.cimxml;
@@ -2654,6 +2655,11 @@
// EXPMETHODCALL
CIMRequest request = new CIMRequest();
+ String methodname = attribute(pExpMethodCallE, "NAME");
+ if (methodname == null) throw new CIMXMLParseException(
+ "EXPMETHODCALL element missing NAME attribute!");
+ request.setMethodName(methodname);
+
Element[] paramValElementA = searchNodes(pExpMethodCallE, "EXPPARAMVALUE");
Vector<CIMInstance> v = new Vector<CIMInstance>();
if (paramValElementA != null) {
@@ -2680,6 +2686,9 @@
// <!ATTLIST EXPPARAMVALUE
// %CIMName;>
// INSTANCE
+ if (attribute(pExpParamValueE, "NAME") == null) throw new CIMXMLParseException(
+ "EXPPARAMVALUE element missing NAME attribute!");
+
Element[] instanceA = searchNodes(pExpParamValueE, "INSTANCE");
if (instanceA != null && instanceA.length > 0) {
if (instanceA.length > 1) throw new CIMXMLParseException(
|
