[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.70, 1.71

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6822/src/org/sblim/cimclient/internal/cimxml

Modified Files:
	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.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- CIMXMLParserImpl.java	6 Nov 2013 16:34:47 -0000	1.70
+++ CIMXMLParserImpl.java	25 Nov 2013 12:27:38 -0000	1.71
@@ -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;
@@ -2653,6 +2654,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) {
@@ -2679,6 +2685,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(