From: Dave B. <bla...@us...> - 2013-10-18 18:40:20
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9569/src/org/sblim/cimclient/internal/cimxml/sax Modified Files: Tag: Experimental EmbObjHandler.java Log Message: 2691 RETURNVALUE should not require PARAMTYPE attribute Index: EmbObjHandler.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -u -d -r1.1.2.17 -r1.1.2.18 --- EmbObjHandler.java 31 Mar 2012 15:39:42 -0000 1.1.2.17 +++ EmbObjHandler.java 18 Oct 2013 18:40:18 -0000 1.1.2.18 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2012 + * (C) Copyright IBM Corp. 2006, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -25,6 +25,7 @@ * 3281781 2011-04-11 blaschke-oss fail to parse Embedded Instance parameter * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 * 3513349 2012-03-31 blaschke-oss TCK: CIMDataType must not accept null string + * 2691 2013-10-18 blaschke-oss RETURNVALUE should not require PARAMTYPE attribute */ package org.sblim.cimclient.internal.cimxml.sax; @@ -321,8 +322,8 @@ private void setType() throws SAXException { if (this.iType != null || this.iRawType != null) return; this.iRawType = this.iAbsValNode.getType(); - if (this.iRawType == null) throw new SAXException("Contained element " - + this.iAbsValNode.getNodeName() + " has unknown type!"); + if (this.iRawType == null) this.iRawType = (this.iAbsValNode instanceof ArrayIf ? CIMDataType.STRING_ARRAY_T + : CIMDataType.STRING_T); } } |