From: Dave B. <bla...@us...> - 2013-05-10 02:53:19
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3857/src/org/sblim/cimclient/internal/cimxml Modified Files: Tag: Experimental CIMXMLBuilderImpl.java Log Message: 2638 Do not build empty REFERENCECLASS Index: CIMXMLBuilderImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLBuilderImpl.java,v retrieving revision 1.9.2.36 retrieving revision 1.9.2.37 diff -u -d -r1.9.2.36 -r1.9.2.37 --- CIMXMLBuilderImpl.java 23 Feb 2013 19:56:54 -0000 1.9.2.36 +++ CIMXMLBuilderImpl.java 10 May 2013 02:53:17 -0000 1.9.2.37 @@ -50,6 +50,7 @@ * 3304058 2011-05-20 blaschke-oss Use same date format in change history * 3588558 2012-11-26 blaschke-oss An enhancement on Java CIM Client logging * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() + * 2638 2013-05-09 blaschke-oss Do not build empty REFERENCECLASS */ package org.sblim.cimclient.internal.cimxml; @@ -287,7 +288,8 @@ Element e = pDoc.createElement("PROPERTY.REFERENCE"); if (pName != null) e.setAttribute("NAME", pName); - if (pReferenceclass != null) e.setAttribute("REFERENCECLASS", pReferenceclass); + if (pReferenceclass != null && pReferenceclass.length() > 0) e.setAttribute( + "REFERENCECLASS", pReferenceclass); pParentE.appendChild(e); return e; } @@ -1629,7 +1631,9 @@ if (type.isArray()) { if (typeCode == CIMDataType.REFERENCE) { parameterE = pDoc.createElement("PARAMETER.REFARRAY"); - parameterE.setAttribute("REFERENCECLASS", type.getRefClassName()); + String refclass = type.getRefClassName(); + if (refclass != null && refclass.length() > 0) parameterE.setAttribute( + "REFERENCECLASS", type.getRefClassName()); } else { parameterE = pDoc.createElement("PARAMETER.ARRAY"); parameterE.setAttribute("TYPE", typeStr); @@ -1637,7 +1641,9 @@ } else { if (typeCode == CIMDataType.REFERENCE) { parameterE = pDoc.createElement("PARAMETER.REFERENCE"); - parameterE.setAttribute("REFERENCECLASS", type.getRefClassName()); + String refclass = type.getRefClassName(); + if (refclass != null && refclass.length() > 0) parameterE.setAttribute( + "REFERENCECLASS", type.getRefClassName()); } else { parameterE = pDoc.createElement("PARAMETER"); parameterE.setAttribute("TYPE", typeStr); |