sblim-commit

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

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
2685 Element.getAttribute returns empty string if no attribute

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.55
retrieving revision 1.14.2.56
diff -u -d -r1.14.2.55 -r1.14.2.56
--- CIMXMLParserImpl.java	7 Oct 2013 20:50:24 -0000	1.14.2.55
+++ CIMXMLParserImpl.java	7 Oct 2013 21:55:35 -0000	1.14.2.56
@@ -72,6 +72,7 @@
  *    2681    2013-10-02  blaschke-oss parseQUALIFIERDECLARATION does not require TYPE attribute
  *    2683    2013-10-07  blaschke-oss KEYVALUE VALUETYPE optional, "string" default
  *    2684    2013-10-07  blaschke-oss parseEXPMETHODRESPONSE has several issues
+ *    2685    2013-10-07  blaschke-oss Element.getAttribute returns empty string if no attribute
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -2053,7 +2054,7 @@
 		// <!ATTLIST PROPERTY.ARRAY
 		// %NAME;%TYPE;%ARRAYSIZE;%CLASSORIGIN;%PROPAGATED;>
 
-		String name = pPropArrayE.getAttribute("NAME");
+		String name = attribute(pPropArrayE, "NAME");
 		if (name == null) throw new CIMXMLParseException(
 				"PROPERTY.ARRAY element missing NAME attribute!");
 
@@ -2099,7 +2100,7 @@
 		// <!ATTLIST PROPERTY.REFERENCE
 		// %NAME;%REFERENCECLASS;%CLASSORIGIN;%PROPAGATED;>
 
-		String name = pPropRefE.getAttribute("NAME");
+		String name = attribute(pPropRefE, "NAME");
 		if (name == null) throw new CIMXMLParseException(
 				"PROPERTY.REFERENCE element missing NAME attribute!");
 
@@ -2448,7 +2449,7 @@
 		// ((LOCALCLASSPATH|LOCALINSTANCEPATH),PARAMVALUE*)>
 		// <!ATTLIST METHODCALL
 		// %CIMName;>
-		if (pMethodCallE.getAttribute("NAME") == null) throw new CIMXMLParseException(
+		if (attribute(pMethodCallE, "NAME") == null) throw new CIMXMLParseException(
 				"METHODCALL element missing NAME attribute!");
 
 		CIMRequest request = new CIMRequest();
@@ -2502,7 +2503,7 @@
 		// %CIMName;>
 
 		CIMRequest request = new CIMRequest();
-		String methodname = pIMethodCallE.getAttribute("NAME"); // ebak:
+		String methodname = attribute(pIMethodCallE, "NAME"); // ebak:
 		// CIMName->NAME
 		if (methodname == null) throw new CIMXMLParseException(
 				"IMETHODCALL element missing NAME attribute!");
@@ -2648,7 +2649,7 @@
 	public static CIMResponse parseMETHODRESPONSE(Element pMethodResponseE)
 			throws CIMXMLParseException {
 		// <!ELEMENT METHODRESPONSE (ERROR|(RETURNVALUE?,PARAMVALUE*))>
-		if (pMethodResponseE.getAttribute("NAME") == null) throw new CIMXMLParseException(
+		if (attribute(pMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
 				"METHODRESPONSE element missing NAME attribute!");
 
 		CIMResponse response = new CIMResponse();
@@ -2715,7 +2716,7 @@
 	public static CIMResponse parseIMETHODRESPONSE(Element pIMethodResponseE)
 			throws CIMXMLParseException {
 		// <!ELEMENT IMETHODRESPONSE (ERROR|(IRETURNVALUE?, PARAMVALUE*))>
-		if (pIMethodResponseE.getAttribute("NAME") == null) throw new CIMXMLParseException(
+		if (attribute(pIMethodResponseE, "NAME") == null) throw new CIMXMLParseException(
 				"IMETHODRESPONSE element missing NAME attribute!");
 
 		CIMResponse response = new CIMResponse();