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

[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-serv4288/src/org/sblim/cimclient/internal/cimxml

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
2688 parseMETHODCALL looks for CIMName attribute instead of NAME

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.57
retrieving revision 1.14.2.58
diff -u -d -r1.14.2.57 -r1.14.2.58
--- CIMXMLParserImpl.java	10 Oct 2013 11:01:04 -0000	1.14.2.57
+++ CIMXMLParserImpl.java	10 Oct 2013 11:40:27 -0000	1.14.2.58
@@ -74,6 +74,7 @@
  *    2684    2013-10-07  blaschke-oss parseEXPMETHODRESPONSE has several issues
  *    2685    2013-10-07  blaschke-oss Element.getAttribute returns empty string if no attribute
  *    2686    2013-10-10  blaschke-oss parseEXPPARAMVALUE allows 2+ children, prohibits 0 
+ *    2688    2013-10-10  blaschke-oss parseMETHODCALL looks for CIMName attribute instead of NAME
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -2450,11 +2451,11 @@
 		// ((LOCALCLASSPATH|LOCALINSTANCEPATH),PARAMVALUE*)>
 		// <!ATTLIST METHODCALL
 		// %CIMName;>
-		if (attribute(pMethodCallE, "NAME") == null) throw new CIMXMLParseException(
-				"METHODCALL element missing NAME attribute!");
 
 		CIMRequest request = new CIMRequest();
-		String methodname = pMethodCallE.getAttribute("CIMName");
+		String methodname = attribute(pMethodCallE, "NAME");
+		if (methodname == null) throw new CIMXMLParseException(
+				"METHODCALL element missing NAME attribute!");
 		request.setMethodName(methodname);
 
 		// EXPMETHODCALL