From: Dave B. <bla...@us...> - 2011-04-11 18:13:15
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax In directory vz-cvs-3.sog:/tmp/cvs-serv31845/src/org/sblim/cimclient/internal/cimxml/sax Modified Files: Tag: Experimental EmbObjHandler.java Log Message: 3281781 - fail to parse Embedded Instance parameter Index: EmbObjHandler.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/EmbObjHandler.java,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -u -d -r1.1.2.14 -r1.1.2.15 --- EmbObjHandler.java 29 Jul 2010 18:44:22 -0000 1.1.2.14 +++ EmbObjHandler.java 11 Apr 2011 18:13:13 -0000 1.1.2.15 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2010 + * (C) Copyright IBM Corp. 2006, 2011 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -22,6 +22,7 @@ * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2763216 2009-04-14 blaschke-oss Code cleanup: visible spelling/grammar errors * 2957387 2010-03-03 blaschke-oss EmbededObject XML attribute must not be all uppercases + * 3281781 2011-04-11 blaschke-oss fail to parse Embedded Instance parameter */ package org.sblim.cimclient.internal.cimxml.sax; @@ -278,9 +279,10 @@ if (isEmbeddedInstance() && this.iType.getType() != CIMDataType.OBJECT) throw new SAXException( this.iNodeName + " element is an EmbeddedInstance with non INSTANCE value. " + "It's not valid!"); - if (this.iSession.strictEmbObjParsing() && isEmbeddedClass() - && this.iType.getType() != CIMDataType.CLASS) throw new SAXException(this.iNodeName - + " element is an EmbeddedObject with non CLASS value. It's not valid!"); + if (isEmbeddedClass() && this.iType.getType() != CIMDataType.CLASS + && this.iType.getType() != CIMDataType.OBJECT) throw new SAXException( + this.iNodeName + + " element is an EmbeddedObject with non CLASS/INSTANCE value. It's not valid!"); } private void transformNormObj() throws SAXException { |