Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6996/src/org/sblim/cimclient/internal/cimxml
Modified Files:
Tag: Experimental
CIMXMLParserImpl.java
Log Message:
2725 Resolve CIMVERSION/DTDVERSION issues in CIM element
Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.80
retrieving revision 1.14.2.81
diff -u -d -r1.14.2.80 -r1.14.2.81
--- CIMXMLParserImpl.java 29 Nov 2013 13:50:14 -0000 1.14.2.80
+++ CIMXMLParserImpl.java 18 Feb 2014 20:34:05 -0000 1.14.2.81
@@ -1,7 +1,7 @@
/**
* CIMXMLParserImpl.java
*
- * (C) Copyright IBM Corp. 2005, 2013
+ * (C) Copyright IBM Corp. 2005, 2014
*
* THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE
* ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE
@@ -94,6 +94,7 @@
* 2713 2013-11-22 blaschke-oss Enforce loose validation of CIM-XML documents
* 2715 2013-11-26 blaschke-oss Add VALUE.NULL support
* 2538 2013-11-28 blaschke-oss CR14: Support new CORRELATOR element
+ * 2725 2014-02-18 blaschke-oss Resolve CIMVERSION/DTDVERSION issues in CIM element
*/
package org.sblim.cimclient.internal.cimxml;
@@ -2382,8 +2383,8 @@
Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION");
if (protocolA == null) throw new CIMXMLParseException(
"MESSAGE element missing PROTOCOLVERSION attribute!");
- // TODO
- if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) {
+
+ if (pCimVersion.startsWith("2.") && pDtdVersion.startsWith("2.")) {
// Attr message_idA = (Attr)searchAttribute(messageE, "ID");
// String messadeID = message_idA.getNodeValue();
@@ -2460,8 +2461,7 @@
}
throw new CIMXMLParseException("MESSAGE element missing required child element!");
}
- // TODO, look for the specific error message in the spec
- throw new CIMXMLParseException("DTD not supported");
+ throw new CIMXMLParseException("Unsupported CIMVERSION/DTDVERSION");
}
private static final String nodesPARAMVALUE[] = { "VALUE", "VALUE.REFERENCE", "VALUE.ARRAY",
|
