[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node Node.java, 1.11, 1.12 QualiDeclNode.java, 1.9, 1.10 QualifierNode.java, 1.12, 1.13 ValueArrayNode.java, 1.9, 1.10

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node
In directory vz-cvs-3.sog:/tmp/cvs-serv15775/src/org/sblim/cimclient/internal/cimxml/sax/node

Modified Files:
	Node.java QualiDeclNode.java QualifierNode.java 
	ValueArrayNode.java 
Log Message:
3513353 - TCK: CIMDataType arrays must have length >= 1

Index: Node.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/Node.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Node.java	10 Mar 2009 17:05:32 -0000	1.11
+++ Node.java	13 Apr 2012 13:47:34 -0000	1.12
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -21,7 +21,8 @@
  * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
  * 2038305    2008-08-14  blaschke-oss SAXException SBLIM Java Client V2.0.7
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2) 
+ * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -29,6 +30,7 @@
 import javax.cim.CIMDataType;
 import javax.cim.CIMFlavor;
 
+import org.sblim.cimclient.internal.cim.CIMHelper;
 import org.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
 import org.sblim.cimclient.internal.cimxml.sax.NodeConstIf;
 import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
@@ -248,7 +250,10 @@
 		boolean isArray = hasTrueAttribute(pAttribs, "ISARRAY");
 		String arraySizeStr = pAttribs.getValue("ARRAYSIZE");
 		int arraySize = (arraySizeStr == null ? (isArray ? 0 : -1) : Integer.parseInt(arraySizeStr));
-		if (isArray || arraySize >= 0) { return new CIMDataType(type.getType(), arraySize); }
+		if (isArray || arraySize >= 0) {
+			if (arraySize > 0) return new CIMDataType(type.getType(), arraySize);
+			return CIMHelper.UnboundedArrayDataType(type.getType());
+		}
 		return type;
 	}
 

Index: QualiDeclNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualiDeclNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- QualiDeclNode.java	13 Apr 2012 12:59:50 -0000	1.9
+++ QualiDeclNode.java	13 Apr 2012 13:47:34 -0000	1.10
@@ -22,6 +22,7 @@
  * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -30,6 +31,7 @@
 import javax.cim.CIMObjectPath;
 import javax.cim.CIMQualifierType;
 
+import org.sblim.cimclient.internal.cim.CIMHelper;
 import org.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
 import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
@@ -155,7 +157,8 @@
 				setType(valAChild);
 				this.iValue = CIMObjectFactory.getObject(this.iType, valAChild);
 				// making array type
-				if (!this.iType.isArray()) this.iType = new CIMDataType(this.iType.getType(), 0);
+				if (!this.iType.isArray()) this.iType = CIMHelper.UnboundedArrayDataType(this.iType
+						.getType());
 			} else if (pChild instanceof ValueNode) {
 				ValueNode valChild = (ValueNode) pChild;
 				setType(valChild);

Index: ValueArrayNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ValueArrayNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ValueArrayNode.java	10 Mar 2009 17:05:32 -0000	1.9
+++ ValueArrayNode.java	13 Apr 2012 13:47:34 -0000	1.10
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -20,7 +20,8 @@
  * 1735693    2007-06-12  ebak         Empty VALUE.ARRAY elements are parsed as nulls
  * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2) 
+ * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -30,6 +31,7 @@
 import javax.cim.CIMDataType;
 
 import org.sblim.cimclient.GenericExts;
+import org.sblim.cimclient.internal.cim.CIMHelper;
 import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
@@ -65,7 +67,8 @@
 		CIMDataType scalarType = getCIMType(pAttribs, true);
 		if (scalarType == null) scalarType = getParamType(pAttribs);
 		// make array type
-		this.iType = scalarType == null ? null : new CIMDataType(scalarType.getType(), 0);
+		this.iType = scalarType == null ? null : CIMHelper.UnboundedArrayDataType(scalarType
+				.getType());
 	}
 
 	/**

Index: QualifierNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/QualifierNode.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- QualifierNode.java	12 Jun 2009 02:33:23 -0000	1.12
+++ QualifierNode.java	13 Apr 2012 13:47:34 -0000	1.13
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2012
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -22,8 +22,9 @@
  * 2013628    2008-07-30  rgummada     SAXException when listing classes
  * 2204488 	  2008-10-28  raman_arora  Fix code to remove compiler warnings
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
- * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2) 
+ * 2531371    2009-02-10  raman_arora  Upgrade client to JDK 1.5 (Phase 2)
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
+ * 3513353    2012-03-30  blaschke-oss TCK: CIMDataType arrays must have length >= 1
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -31,6 +32,7 @@
 import javax.cim.CIMDataType;
 import javax.cim.CIMQualifier;
 
+import org.sblim.cimclient.internal.cim.CIMHelper;
 import org.sblim.cimclient.internal.cimxml.sax.CIMObjectFactory;
 import org.sblim.cimclient.internal.cimxml.sax.SAXSession;
 import org.xml.sax.Attributes;
@@ -111,7 +113,8 @@
 			// create array value
 			value = CIMObjectFactory.getObject(this.iType, valANode);
 			// constructs array type
-			type = this.iType.isArray() ? this.iType : new CIMDataType(this.iType.getType(), 0);
+			type = this.iType.isArray() ? this.iType : CIMHelper.UnboundedArrayDataType(this.iType
+					.getType());
 		} else if (absValNode instanceof ValueNode) {
 			ValueNode valNode = (ValueNode) absValNode;
 			setType(valNode);