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

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

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
2683 KEYVALUE VALUETYPE optional, "string" default

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.53
retrieving revision 1.14.2.54
diff -u -d -r1.14.2.53 -r1.14.2.54
--- CIMXMLParserImpl.java	2 Oct 2013 17:26:21 -0000	1.14.2.53
+++ CIMXMLParserImpl.java	7 Oct 2013 17:28:16 -0000	1.14.2.54
@@ -69,7 +69,8 @@
  *    2678    2013-09-30  blaschke-oss parseMULTI___ allows one SIMPLE___ child element
  *    2679    2013-10-01  blaschke-oss parseIMETHODCALL requires one IPARAMVALUE child element
  *    2680    2013-10-02  blaschke-oss IPARAMVALUE parsing broken on DOM/SAX
- *    2681    2013-10-02  blaschke-oss parseQUALIFIERDECLARATION does not require TYPE attribute 
+ *    2681    2013-10-02  blaschke-oss parseQUALIFIERDECLARATION does not require TYPE attribute
+ *    2683    2013-10-07  blaschke-oss KEYVALUE VALUETYPE optional, "string" default  
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -946,6 +947,7 @@
 
 		if (typeStr == null) {
 			String valueTypeStr = attribute(pKeyValueE, "VALUETYPE");
+			if (valueTypeStr == null) valueTypeStr = "string";
 			ValueTypeHandler vtHandler = new ValueTypeHandler(valueTypeStr, valueStr);
 			return new TypedValue(vtHandler.getType(), vtHandler.getValue());
 		}
@@ -1051,11 +1053,7 @@
 		}
 
 		private boolean setBoolean(String pValue) {
-			try {
-				this.iValue = Boolean.valueOf(pValue);
-			} catch (NumberFormatException e) {
-				return false;
-			}
+			this.iValue = Boolean.valueOf(pValue);
 			this.iType = CIMDataType.BOOLEAN_T;
 			return true;
 		}