From: Dave B. <bla...@us...> - 2013-11-25 13:42:38
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11616/src/org/sblim/cimclient/internal/cimxml Modified Files: CIMXMLParserImpl.java Log Message: 2701 PROPERTY.ARRAY does not require TYPE attribute Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.75 retrieving revision 1.76 diff -u -d -r1.75 -r1.76 --- CIMXMLParserImpl.java 25 Nov 2013 13:33:29 -0000 1.75 +++ CIMXMLParserImpl.java 25 Nov 2013 13:42:35 -0000 1.76 @@ -82,6 +82,7 @@ * 2696 2013-10-29 blaschke-oss parseIRETURNVALUE ignores VALUE and VALUE.ARRAY * 2699 2013-11-05 blaschke-oss parseQUALIFIER does not require TYPE attribute * 2700 2013-11-07 blaschke-oss PROPERTY does not require TYPE attribute + * 2701 2013-11-07 blaschke-oss PROPERTY.ARRAY does not require TYPE attribute */ package org.sblim.cimclient.internal.cimxml; @@ -2072,6 +2073,8 @@ String name = attribute(pPropArrayE, "NAME"); if (name == null) throw new CIMXMLParseException( "PROPERTY.ARRAY element missing NAME attribute!"); + if (attribute(pPropArrayE, "TYPE") == null && !hasTypeAttrsInNodes(pPropArrayE)) throw new CIMXMLParseException( + "PROPERTY.ARRAY element missing TYPE attribute!"); // String valueArraysizeStr = propertyarrayE.getAttribute("ARRAYSIZE"); |