From: Dave B. <bla...@us...> - 2013-09-27 19:46:14
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24951/src/org/sblim/cimclient/internal/cimxml Modified Files: Tag: Experimental CIMXMLParserImpl.java Log Message: 2676 parseMULTI(EXP)REQ looking for wrong child elements Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.14.2.48 retrieving revision 1.14.2.49 diff -u -d -r1.14.2.48 -r1.14.2.49 --- CIMXMLParserImpl.java 27 Sep 2013 18:32:19 -0000 1.14.2.48 +++ CIMXMLParserImpl.java 27 Sep 2013 19:46:11 -0000 1.14.2.49 @@ -65,6 +65,7 @@ * 2670 2013-09-25 blaschke-oss NAME attribute not required by DOM parser * 2671 2013-09-25 blaschke-oss Potential null pointer exception in parseERROR * 2675 2013-09-27 blaschke-oss CIMXMLParseException messages should contain element name + * 2676 2013-09-27 blaschke-oss parseMULTI(EXP)REQ looking for wrong child elements */ package org.sblim.cimclient.internal.cimxml; @@ -2398,13 +2399,13 @@ public static CIMRequest parseMULTIREQ(Element pMultiReqE) throws CIMXMLParseException { // <!ELEMENT MULTIREQ (SIMPLEREQ,SIMPLEREQ+)> - Element[] methodReqElementA = searchNodes(pMultiReqE, "MULTIREQ"); + Element[] methodReqElementA = searchNodes(pMultiReqE, "SIMPLEREQ"); if (methodReqElementA != null && methodReqElementA.length > 0) { CIMRequest multiReq = new CIMRequest(); for (int i = 0; i < methodReqElementA.length; i++) { Element methodrequestE = methodReqElementA[i]; CIMRequest req = parseSIMPLEREQ(methodrequestE); - req.setMethod("MULTIPREQ"); + req.setMethod("SIMPLEREQ"); multiReq.addRequest(req); } @@ -2552,7 +2553,7 @@ public static CIMRequest parseMULTIEXPREQ(Element pMultiExpReqE) throws CIMXMLParseException { // <!ELEMENT SIMPLEEXPREQ (METHODRESPONSE)> - Element[] methodReqElementA = searchNodes(pMultiExpReqE, "SIMPLEEXREQ"); + Element[] methodReqElementA = searchNodes(pMultiExpReqE, "SIMPLEEXPREQ"); if (methodReqElementA != null && methodReqElementA.length > 0) { CIMRequest multiReq = new CIMRequest(); for (int i = 0; i < methodReqElementA.length; i++) { |