Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24233/src/org/sblim/cimclient/internal/cimxml
Modified Files:
Tag: Experimental
CIMXMLParserImpl.java
Log Message:
2695 parseMETHODCALL allows LOCALCLASSPATH and LOCALINSTANCEPATH
Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.62
retrieving revision 1.14.2.63
diff -u -d -r1.14.2.62 -r1.14.2.63
--- CIMXMLParserImpl.java 25 Oct 2013 15:02:24 -0000 1.14.2.62
+++ CIMXMLParserImpl.java 25 Oct 2013 15:55:20 -0000 1.14.2.63
@@ -77,7 +77,8 @@
* 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)
+ * 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
*/
package org.sblim.cimclient.internal.cimxml;
@@ -2518,6 +2519,9 @@
Element localinstancepathE = (Element) searchFirstNode(pMethodCallE, "LOCALINSTANCEPATH");
if (localinstancepathE != null) {
+ if (localclasspathFound) throw new CIMXMLParseException(
+ "METHODCALL element cannot have both LOCALCLASSPATH and LOCALINSTANCEPATH child elements!");
+
CIMObjectPath path = parseLOCALINSTANCEPATH(localinstancepathE);
request.setObjectPath(path);
|