Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5358/src/org/sblim/cimclient/internal/cimxml
Modified Files:
Tag: Experimental
CIMXMLParserImpl.java
Log Message:
2696 parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.63
retrieving revision 1.14.2.64
diff -u -d -r1.14.2.63 -r1.14.2.64
--- CIMXMLParserImpl.java 25 Oct 2013 15:55:20 -0000 1.14.2.63
+++ CIMXMLParserImpl.java 29 Oct 2013 18:46:27 -0000 1.14.2.64
@@ -79,6 +79,7 @@
* 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)
* 2695 2013-10-25 blaschke-oss parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
+ * 2696 2013-10-29 blaschke-oss parseIRETURNVALUE ignores VALUE and VALUE.ARRAY
*/
package org.sblim.cimclient.internal.cimxml;
@@ -2969,23 +2970,24 @@
}
// VALUE
- // Vector valueV = searchNodes(ireturnvalueE, "VALUE");
- // if (valueV != null) {
- // for (int i=0; i<valueV.size(); i++) {
- // Element valueE = (Element)valueV.elementAt(i);
- // String valueStr = parseVALUE(valueE);
- // // cannot construct a CIMValue without type information
- // }
- // }
+ Element[] valElementA = searchNodes(pIRetValE, "VALUE");
+ if (valElementA != null && valElementA.length > 0) {
+ for (int i = 0; i < valElementA.length; i++) {
+ Element valueE = valElementA[i];
+ TypedValue tv = parseVALUE(valueE);
+ rtnV.add(tv.getValue());
+ }
+ }
// VALUE.ARRAY
- // Vector valuearrayV = searchNodes(ireturnvalueE, "VALUE.ARRAY");
- // if (valuearrayV != null) {
- // for (int i=0; i<valuearrayV.size(); i++) {
- // Element valuearrayE = (Element)valuearrayV.elementAt(i);
- // // cannot construct a CIMValue without type information
- // }
- // }
+ Element[] valArrayElementA = searchNodes(pIRetValE, "VALUE.ARRAY");
+ if (valArrayElementA != null && valArrayElementA.length > 0) {
+ for (int i = 0; i < valArrayElementA.length; i++) {
+ Element valueArrayE = valArrayElementA[i];
+ TypedValue tv = parseVALUEARRAY(valueArrayE);
+ rtnV.add(tv.getValue());
+ }
+ }
// VALUE.REFERENCE
Element[] valRefElementA = searchNodes(pIRetValE, "VALUE.REFERENCE");
|
