[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax CIMObjectFactory.java, 1.6.2.14, 1.6.2.15

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

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

Modified Files:
      Tag: Experimental
	CIMObjectFactory.java 
Log Message:
2693 ReturnValueNode allows invalid PARAMTYPE attribute

Index: CIMObjectFactory.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/CIMObjectFactory.java,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -u -d -r1.6.2.14 -r1.6.2.15
--- CIMObjectFactory.java	2 Oct 2012 02:03:39 -0000	1.6.2.14
+++ CIMObjectFactory.java	21 Oct 2013 11:25:26 -0000	1.6.2.15
@@ -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 
@@ -26,6 +26,7 @@
  * 3027615    2010-07-12  blaschke-oss Use CLASS_ARRAY_T instead of new CIMDataType(CLASS,0)
  * 3513349    2012-03-31  blaschke-oss TCK: CIMDataType must not accept null string
  * 3572993    2012-10-01  blaschke-oss parseDouble("2.2250738585072012e-308") DoS vulnerability
+ *    2693    2013-10-21  blaschke-oss ReturnValueNode allows invalid PARAMTYPE attribute
  */
 
 package org.sblim.cimclient.internal.cimxml.sax;
@@ -270,11 +271,15 @@
 	 * 
 	 * @param pTypeStr
 	 * @return CIMDataType
+	 * @throws SAXException
 	 */
-	public static CIMDataType getType(String pTypeStr) {
+	public static CIMDataType getType(String pTypeStr) throws SAXException {
 		if (pTypeStr == null) return null;
 		createTypeStrMap();
-		return cTypeStrMap.get(pTypeStr);
+		CIMDataType type = cTypeStrMap.get(pTypeStr);
+		if (type == null && !cTypeStrMap.containsKey(pTypeStr)) throw new SAXException(pTypeStr
+				+ " is invalid PARAMTYPE!");
+		return type;
 	}
 
 	static final CIMInstance[] EMPTY_INST_A = new CIMInstance[0];