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

[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-serv815/src/org/sblim/cimclient/internal/cimxml

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
2680 IPARAMVALUE parsing broken on DOM/SAX #2

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.58
retrieving revision 1.14.2.59
diff -u -d -r1.14.2.58 -r1.14.2.59
--- CIMXMLParserImpl.java	10 Oct 2013 11:40:27 -0000	1.14.2.58
+++ CIMXMLParserImpl.java	11 Oct 2013 14:28:21 -0000	1.14.2.59
@@ -1430,7 +1430,7 @@
 				TypedValue tVal = parseVALUE(valueE);
 				String valueStr = (String) tVal.getValue();
 				type = typeStr == null ? tVal.getType() : parseScalarTypeStr(typeStr);
-				value = createJavaObject(type.toString(), valueStr);
+				value = createJavaObject(type == null ? null : type.toString(), valueStr);
 			}
 		}
 		if (type == null && (pMask & VALUEREF) > 0) {
@@ -1452,7 +1452,8 @@
 				if (valStrA != null) {
 					Object[] values = new Object[valStrA.length];
 					for (int i = 0; i < valStrA.length; i++) {
-						values[i] = createJavaObject(type.toString(), valStrA[i]);
+						values[i] = createJavaObject(type == null ? null : type.toString(),
+								valStrA[i]);
 					}
 					value = values;
 				}
@@ -2338,7 +2339,7 @@
 			return new CIMArgument<Object>(name, CIMDataType.OBJECT_T, inst);
 		}
 
-		throw new CIMXMLParseException("IPARAMVALUE element missing required child element!");
+		return new CIMArgument<Object>(name, CIMDataType.STRING_T, null);
 	}
 
 	/**