[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.14.2.39, 1.14.2.40

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

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26483/src/org/sblim/cimclient/internal/cimxml

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
3598613 different data type in cim instance and cim object path

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.39
retrieving revision 1.14.2.40
diff -u -d -r1.14.2.39 -r1.14.2.40
--- CIMXMLParserImpl.java	2 Oct 2012 02:03:39 -0000	1.14.2.39
+++ CIMXMLParserImpl.java	17 Jan 2013 14:28:20 -0000	1.14.2.40
@@ -1,7 +1,7 @@
 /**
  * CIMXMLParserImpl.java
  *
- * (C) Copyright IBM Corp. 2005, 2012
+ * (C) Copyright IBM Corp. 2005, 2013
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -56,6 +56,7 @@
  * 3521119    2012-04-24  blaschke-oss JSR48 1.0.0: remove CIMObjectPath 2/3/4-parm ctors
  * 3526679    2012-05-14  blaschke-oss DOM parser ignores ERROR node CODE
  * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
+ * 3598613    2013-01-11  blaschke-oss different data type in cim instance and cim object path
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -1294,8 +1295,11 @@
 		// PROPERTY
 		CIMProperty<?>[] props = parsePROPERTIES(pInstanceE);
 
-		return new CIMInstance(pObjPath == null ? cLocalPathBuilder.build(className, null)
-				: pObjPath, props);
+		if (pObjPath == null) return new CIMInstance(cLocalPathBuilder.build(className, null),
+				props);
+		if (WBEMConfiguration.getGlobalConfiguration().synchronizeNumericKeyDataTypes()) return CIMHelper
+				.CIMInstanceWithSynchonizedNumericKeyDataTypes(pObjPath, props);
+		return new CIMInstance(pObjPath, props);
 	}
 
 	/**