[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/util MOF.java, 1.7.2.15, 1.7.2.16

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util
In directory vz-cvs-3.sog:/tmp/cvs-serv3509/src/org/sblim/cimclient/internal/util

Modified Files:
      Tag: Experimental
	MOF.java 
Log Message:
3529151 - TCK: CIMInstance property APIs include keys from COP

Index: MOF.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/util/MOF.java,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -d -r1.7.2.15 -r1.7.2.16
--- MOF.java	23 Mar 2012 16:44:47 -0000	1.7.2.15
+++ MOF.java	23 Aug 2012 12:37:29 -0000	1.7.2.16
@@ -25,6 +25,7 @@
  * 2797550    2009-06-01  raman_arora  JSR48 compliance - add Java Generics
  * 3185824    2011-02-18  blaschke-oss Char16 definition includes whitespace
  * 3510090    2012-03-23  blaschke-oss Fix CIMObjectPath.toString() inconsistencies
+ * 3529151    2012-08-22  blaschke-oss TCK: CIMInstance property APIs include keys from COP
  */
 
 package org.sblim.cimclient.internal.util;
@@ -295,8 +296,16 @@
 		// TODO: What is the alias? How to use?
 		StringBuffer buf = new StringBuffer();
 		buf.append(pInd + INSTOF + pInst.getClassName() + " {\n");
+		// Add all properties in prop array
 		for (int i = 0; i < pInst.getPropertyCount(); i++)
 			buf.append(valueInitializer(pInst.getProperty(i), pInd + INDENT));
+		// Add keys that are NOT also in prop array
+		CIMProperty<?>[] keys = pInst.getKeys();
+		for (int i = 0; i < keys.length; i++) {
+			if (pInst.getProperty(keys[i].getName()) == null) {
+				buf.append(valueInitializer(keys[i], pInd + INDENT));
+			}
+		}
 		buf.append(pInd + "};");
 		return buf.toString();
 	}