Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Dave B. <bla...@us...> - 2013-05-16 00:00:15
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21986/src/org/sblim/cimclient/internal/cimxml Modified Files: Tag: CIM_CLIENT_2_2_2_M CIMXMLParserImpl.java Log Message: 2636 Nested embedded instances cause CIMXMLParseException Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.51 retrieving revision 1.51.2.1 diff -u -d -r1.51 -r1.51.2.1 --- CIMXMLParserImpl.java 9 Mar 2013 12:29:56 -0000 1.51 +++ CIMXMLParserImpl.java 16 May 2013 00:00:13 -0000 1.51.2.1 @@ -58,6 +58,7 @@ * 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 * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() + * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException */ package org.sblim.cimclient.internal.cimxml; @@ -1211,7 +1212,7 @@ throws CIMXMLParseException { String name = attribute(pParamE, "NAME"); String referenceClass = attribute(pParamE, "REFERENCECLASS"); - CIMDataType type = new CIMDataType(referenceClass); + CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : ""); // QUALIFIER CIMQualifier<?>[] qualis = parseQUALIFIERS(pParamE); return new CIMParameter<Object>(name, type, qualis); @@ -2031,7 +2032,6 @@ if (classOrigin != null && classOrigin.length() == 0) classOrigin = null; String referenceClass = pPropRefE.getAttribute("REFERENCECLASS"); - if (referenceClass != null && referenceClass.length() == 0) referenceClass = null; String propagatedStr = pPropRefE.getAttribute("PROPAGATED"); boolean propagated = MOF.TRUE.equalsIgnoreCase(propagatedStr); @@ -2039,7 +2039,7 @@ // QUALIFIER CIMQualifier<?>[] qualis = parseQUALIFIERS(pPropRefE); - CIMDataType type = new CIMDataType(referenceClass); + CIMDataType type = new CIMDataType(referenceClass != null ? referenceClass : ""); // VALUE.REFERENCE Element valueRefE = (Element) searchFirstNode(pPropRefE, "VALUE.REFERENCE"); Object value = valueRefE != null ? parseVALUEREFERENCE(valueRefE) : null; |
|
From: Dave H. <hel...@us...> - 2013-05-15 17:22:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 1c467d6ccd384f16d9109f43f72675dd2ab1c82a (commit)
from 8bcac6c25ee28cd21fa5602314e2514aaad46775 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1c467d6ccd384f16d9109f43f72675dd2ab1c82a
Author: Dave Heller <hel...@us...>
Date: Wed May 15 13:21:43 2013 -0400
[sfcb-tix:#47] fix filemodes on xmltest prereq files
-----------------------------------------------------------------------
Summary of changes:
0 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/test/xmltest/PE_CloseEnumeration.prereq b/test/xmltest/PE_CloseEnumeration.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_EnumerationCount.prereq b/test/xmltest/PE_EnumerationCount.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenAssociatorInstancePaths0.prereq b/test/xmltest/PE_OpenAssociatorInstancePaths0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenAssociatorInstances0.prereq b/test/xmltest/PE_OpenAssociatorInstances0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenEnumerateInstancePaths0.prereq b/test/xmltest/PE_OpenEnumerateInstancePaths0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenEnumerateInstances0.prereq b/test/xmltest/PE_OpenEnumerateInstances0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenQueryInstances0.prereq b/test/xmltest/PE_OpenQueryInstances0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenReferenceInstancePaths0.prereq b/test/xmltest/PE_OpenReferenceInstancePaths0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_OpenReferenceInstances0.prereq b/test/xmltest/PE_OpenReferenceInstances0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_PullInstancePaths0.prereq b/test/xmltest/PE_PullInstancePaths0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_PullInstances0.prereq b/test/xmltest/PE_PullInstances0.prereq
old mode 100644
new mode 100755
diff --git a/test/xmltest/PE_PullInstancesWithPath0.prereq b/test/xmltest/PE_PullInstancesWithPath0.prereq
old mode 100644
new mode 100755
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-05-11 21:43:24
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28611/src/org/sblim/cimclient/internal/cimxml Modified Files: Tag: Experimental CIMXMLParserImpl.java Log Message: 2640 Multiple CDATA parsing broken in DOM parser Index: CIMXMLParserImpl.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v retrieving revision 1.14.2.42 retrieving revision 1.14.2.43 diff -u -d -r1.14.2.42 -r1.14.2.43 --- CIMXMLParserImpl.java 8 May 2013 17:02:50 -0000 1.14.2.42 +++ CIMXMLParserImpl.java 11 May 2013 21:43:22 -0000 1.14.2.43 @@ -59,6 +59,7 @@ * 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException + * 2640 2013-05-11 blaschke-oss Multiple CDATA parsing broken in DOM parser */ package org.sblim.cimclient.internal.cimxml; @@ -184,16 +185,17 @@ String typeStr = attribute(pValueE, "TYPE"); CIMDataType type = typeStr == null ? null : parseScalarTypeStr(typeStr); - Text t = (Text) pValueE.getFirstChild(); // ebak: empty VALUE element is parsed as empty String - String valueStr; - if (t != null) { - String nodeValue = t.getNodeValue(); - valueStr = nodeValue == null ? "" : nodeValue; - } else { - valueStr = ""; + NodeList list = pValueE.getChildNodes(); + StringBuilder valueStr = new StringBuilder(); + for (int i = 0; i < list.getLength(); i++) { + Text t = (Text) list.item(i); + if (t != null) { + String nodeValue = t.getNodeValue(); + if (nodeValue != null) valueStr.append(nodeValue); + } } - return new TypedValue(type, valueStr); + return new TypedValue(type, valueStr.toString()); } /** |
|
From: Dave B. <bla...@us...> - 2013-05-11 16:48:07
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/data In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13907/utst/org/sblim/cimclient/unittest/wbem/data Modified Files: Tag: Experimental enumerateClasses.xml Log Message: 2639 CDATA parsing broken in PULL parser Index: enumerateClasses.xml =================================================================== RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/data/enumerateClasses.xml,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -d -r1.3.2.5 -r1.3.2.6 --- enumerateClasses.xml 19 May 2010 16:59:01 -0000 1.3.2.5 +++ enumerateClasses.xml 11 May 2013 16:48:05 -0000 1.3.2.6 @@ -13,7 +13,7 @@ </QUALIFIER> <PROPERTY NAME="Caption" CLASSORIGIN="CIM_ManagedElement" PROPAGATED="true" TYPE="string"> <QUALIFIER NAME="Description" TYPE="string" OVERRIDABLE="false" TRANSLATABLE="true"> - <VALUE>Long long text...</VALUE> + <VALUE><![CDATA[Long long text...]]></VALUE> </QUALIFIER> </PROPERTY> <PROPERTY NAME="Description" CLASSORIGIN="CIM_ManagedElement" PROPAGATED="true" TYPE="string"></PROPERTY> |
|
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); |
|
From: Dave B. <bla...@us...> - 2013-05-10 00:41:11
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27649/src/org/sblim/cimclient/doc-files Modified Files: Tag: Experimental unittest.html Log Message: 2637 Add nested embedded instance builder test Index: unittest.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/unittest.html,v retrieving revision 1.1.2.31 retrieving revision 1.1.2.32 diff -u -d -r1.1.2.31 -r1.1.2.32 --- unittest.html 8 May 2013 17:02:49 -0000 1.1.2.31 +++ unittest.html 10 May 2013 00:41:09 -0000 1.1.2.32 @@ -39,6 +39,7 @@ * 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException + * 2637 2013-05-09 blaschke-oss Add nested embedded instance builder test --> </head> <body style="background-color: white;"> @@ -186,6 +187,10 @@ <td>Parses a hand made enumerateInstances() response XML file and checks that the embedded instances (that is, an instance within an instance within an instance) are as expected.</td></tr> + <tr><td>testNestedEmbInstBuilder</td> + <td>Builds createInstance() request XML files and checks that the + embedded instances (that is, an instance within an instance within an + instance) are as expected.</td></tr> </table> <h3>wbem.WBEMClientTest</h3> |
|
From: Dave B. <bla...@us...> - 2013-05-10 00:30:17
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27250/utst/org/sblim/cimclient/unittest/wbem Modified Files: Tag: Experimental NestedEmbInstTest.java Log Message: 2637 Add nested embedded instance builder test Index: NestedEmbInstTest.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/Attic/NestedEmbInstTest.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- NestedEmbInstTest.java 8 May 2013 17:02:50 -0000 1.1.2.1 +++ NestedEmbInstTest.java 10 May 2013 00:30:15 -0000 1.1.2.2 @@ -14,18 +14,25 @@ * Flag Date Prog Description * ------------------------------------------------------------------------------- * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException + * 2637 2013-05-09 blaschke-oss Add nested embedded instance builder test */ package org.sblim.cimclient.unittest.wbem; +import java.io.ByteArrayOutputStream; import java.io.InputStream; +import javax.cim.CIMDataType; import javax.cim.CIMInstance; +import javax.cim.CIMObjectPath; import javax.cim.CIMProperty; import javax.cim.UnsignedInteger64; import javax.wbem.CloseableIterator; import javax.wbem.WBEMException; +import org.sblim.cimclient.internal.cimxml.CIMClientXML_HelperImpl; +import org.sblim.cimclient.internal.cimxml.CimXmlSerializer; import org.sblim.cimclient.unittest.TestCase; +import org.w3c.dom.Document; /** * @@ -115,4 +122,82 @@ checkEnumInstResult(Common.parseWithPULL(getInstIS())); } + /** + * testNestedEmbInstBuilder + * + * @throws Exception + */ + public void testNestedEmbInstBuilder() throws Exception { + CIMProperty<String> prop4a = new CIMProperty<String>("CreationClassName", + CIMDataType.STRING_T, "LMI_StorageExtent", true, false, null); + CIMProperty<String> prop4b = new CIMProperty<String>("DeviceID", CIMDataType.STRING_T, + "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-1", true, false, null); + CIMProperty<String> prop4c = new CIMProperty<String>("SystemCreationClassName", + CIMDataType.STRING_T, "Linux_ComputerSystem", true, false, null); + CIMProperty<String> prop4d = new CIMProperty<String>("SystemName", CIMDataType.STRING_T, + "rawhide", true, false, null); + CIMProperty<?>[] props4 = new CIMProperty[] { prop4a, prop4b, prop4c, prop4d }; + + CIMProperty<CIMObjectPath> prop3a = new CIMProperty<CIMObjectPath>("Extent", + new CIMDataType(""), new CIMObjectPath(null, null, null, "root/cimv2", + "CIM_StorageExtent", props4)); + CIMProperty<UnsignedInteger64> prop3b = new CIMProperty<UnsignedInteger64>("Size", + CIMDataType.UINT64_T, new UnsignedInteger64("10000000")); + CIMProperty<?>[] props3 = new CIMProperty[] { prop3a, prop3b }; + CIMInstance inst3 = new CIMInstance(new CIMObjectPath(null, null, null, null, + "CIM_ManagedElement", null), props3); + + CIMProperty<CIMInstance> prop2a = new CIMProperty<CIMInstance>("JobInParameters", + CIMDataType.OBJECT_T, inst3); + CIMProperty<String> prop2b = new CIMProperty<String>("InstanceID", CIMDataType.STRING_T, + "LMI:LMI_StorageJob:1"); + CIMProperty<?>[] props2 = new CIMProperty[] { prop2a, prop2b }; + CIMInstance inst2 = new CIMInstance(new CIMObjectPath(null, null, null, null, + "LMI_StorageJob", null), props2); + + CIMProperty<CIMInstance> prop1a = new CIMProperty<CIMInstance>("SourceInstance", + CIMDataType.OBJECT_T, inst2); + CIMProperty<String> prop1b = new CIMProperty<String>("SourceInstanceModelPath", + CIMDataType.STRING_T, + "//rawhide/root/cimv2:LMI_StorageJob.InstanceID=\"LMI:LMI_StorageJob:1\""); + CIMProperty<?>[] props1 = new CIMProperty[] { prop1a, prop1b }; + CIMInstance inst1 = new CIMInstance(new CIMObjectPath(null, null, null, null, + "LMI_StorageInstModification", null), props1); + + CIMClientXML_HelperImpl helper = new CIMClientXML_HelperImpl(); + helper.setId(3); + Document doc = helper.newDocument(); + helper.createCIMMessage(doc, helper.createInstance_request(doc, new CIMObjectPath(null, + null, null, null, "CIM_ManagedElement", null), inst3)); + ByteArrayOutputStream stream3 = new ByteArrayOutputStream(4096); + CimXmlSerializer.serialize(stream3, doc, false); + + helper.setId(2); + doc = helper.newDocument(); + helper.createCIMMessage(doc, helper.createInstance_request(doc, new CIMObjectPath(null, + null, null, null, "LMI_StorageJob", null), inst2)); + ByteArrayOutputStream stream2 = new ByteArrayOutputStream(4096); + CimXmlSerializer.serialize(stream2, doc, false); + + helper.setId(1); + doc = helper.newDocument(); + helper.createCIMMessage(doc, helper.createInstance_request(doc, new CIMObjectPath(null, + null, null, null, "LMI_StorageInstModification", null), inst1)); + ByteArrayOutputStream stream1 = new ByteArrayOutputStream(4096); + CimXmlSerializer.serialize(stream1, doc, false); + + String level1 = stream3.toString(); + String level2 = stream2.toString(); + String level3 = stream1.toString(); + + String levelExpectedSubstring1 = "<PROPERTY NAME=\"Size\" TYPE=\"uint64\"><VALUE>10000000</VALUE></PROPERTY>"; + // levelExpectedSubstring2 is escaped version of levelExpectedSubstring1 + String levelExpectedSubstring2 = "<PROPERTY NAME="Size" TYPE="uint64"><VALUE>10000000</VALUE></PROPERTY>"; + // levelExpectedSubstring3 is escaped version of levelExpectedSubstring2 + String levelExpectedSubstring3 = "&lt;PROPERTY NAME=&quot;Size&quot; TYPE=&quot;uint64&quot;&gt;&lt;VALUE&gt;10000000&lt;/VALUE&gt;&lt;/PROPERTY&gt;"; + + verify("1st level nesting error!", level1.indexOf(levelExpectedSubstring1) != -1); + verify("2nd level nesting error!", level2.indexOf(levelExpectedSubstring2) != -1); + verify("3rd level nesting error!", level3.indexOf(levelExpectedSubstring3) != -1); + } } |
|
From: Dave H. <hel...@us...> - 2013-05-09 00:22:41
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 273bb8626129a6f80435796a1e3eab7411cafb84 (commit)
from 322c116f79f92e2603b0afafffccc69aa6647e3c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 273bb8626129a6f80435796a1e3eab7411cafb84
Author: Dave Heller <hel...@us...>
Date: Wed May 8 20:20:00 2013 -0400
[sfcb-tix:#46] Error parsing CDATA with no whitespace
-----------------------------------------------------------------------
Summary of changes:
cimXmlParser.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cimXmlParser.c b/cimXmlParser.c
index c154da5..8cb2be6 100644
--- a/cimXmlParser.c
+++ b/cimXmlParser.c
@@ -987,7 +987,7 @@ procCdata(YYSTYPE __attribute__ ((unused)) *lvalp, ParserControl * parm)
XmlAttr attr[1];
if (tagEquals(parm->xmb, "![CDATA[")) {
- parm->xmb->cur[0] = '>';
+ *(--parm->xmb->cur) = '>';
char *v;
if (attrsOk(parm->xmb, elm, attr, "![CDATA[", ZTOK_CDATA)) {
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-05-09 00:22:19
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via 946f5d2c4117682ff281422c867fa1f3a8df233a (commit)
from d304919db4080ed1d3c921b3e20f759217540e4b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 946f5d2c4117682ff281422c867fa1f3a8df233a
Author: Dave Heller <hel...@us...>
Date: Wed May 8 20:20:08 2013 -0400
[sfcb-tix:#46] Error parsing CDATA with no whitespace
-----------------------------------------------------------------------
Summary of changes:
cimXmlParser.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cimXmlParser.c b/cimXmlParser.c
index 3fc62ec..dc8187c 100644
--- a/cimXmlParser.c
+++ b/cimXmlParser.c
@@ -963,7 +963,7 @@ static int procCdata(YYSTYPE * lvalp, ParserControl * parm)
XmlAttr attr[1];
if (tagEquals(parm->xmb, "![CDATA[")) {
- parm->xmb->cur[0] = '>';
+ *(--parm->xmb->cur) = '>';
char *v;
if (attrsOk(parm->xmb, elm, attr, "![CDATA[", ZTOK_CDATA)) {
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-05-08 17:55:18
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8355 Modified Files: NEWS Log Message: 2605 SAX parser throws wrong exception Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.346 retrieving revision 1.347 diff -u -d -r1.346 -r1.347 --- NEWS 8 May 2013 17:30:35 -0000 1.346 +++ NEWS 8 May 2013 17:55:16 -0000 1.347 @@ -1,5 +1,6 @@ Changes in HEAD ================ + 2605 SAX parser throws wrong exception 2628 Limit size of LinkedList of CIMEvents to be dispatched Version 2.2.2 |
|
From: Dave B. <bla...@us...> - 2013-05-08 17:30:38
|
Update of /cvsroot/sblim/jsr48-client In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7286 Modified Files: NEWS sblim-cim-client2.properties Log Message: 2628 Limit size of LinkedList of CIMEvents to be dispatched Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.345 retrieving revision 1.346 diff -u -d -r1.345 -r1.346 --- NEWS 15 Mar 2013 09:30:09 -0000 1.345 +++ NEWS 8 May 2013 17:30:35 -0000 1.346 @@ -1,3 +1,7 @@ +Changes in HEAD +================ + 2628 Limit size of LinkedList of CIMEvents to be dispatched + Version 2.2.2 ================ 2624 Update detailed release history HTML for 2.2.2 Index: sblim-cim-client2.properties =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.properties,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- sblim-cim-client2.properties 14 Mar 2013 13:50:13 -0000 1.33 +++ sblim-cim-client2.properties 8 May 2013 17:30:35 -0000 1.34 @@ -632,6 +632,19 @@ # #sblim.wbem.listenerHandlerMaxIdle=30000 +# The maximum number of queued events (the fixed capacity of the +# LinkedList of indications awaiting delivery to the listener). When +# the maximum is reached, the oldest indications are discarded to make +# room for the newest ones. A value of 0 is interpreted as infinity. +# +# Type: Integer +# Unit: Count +# Recognition: On next creation of a WBEMListener +# Range: 0 .. Integer.MAX_VALUE +# Default: 0 +# +#sblim.wbem.listenerMaxQueuedEvents=0 + # If set to true, reliable indication support is enabled and indications # are processed accordingly. If set to false, reliable indication # support is disabled and indications are passed directly to listener. |
|
From: Dave B. <bla...@us...> - 2013-05-08 17:30:37
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7286/src/org/sblim/cimclient/internal/wbem/indications Modified Files: CIMEventDispatcher.java Log Message: 2628 Limit size of LinkedList of CIMEvents to be dispatched Index: CIMEventDispatcher.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications/CIMEventDispatcher.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- CIMEventDispatcher.java 20 Feb 2012 18:37:50 -0000 1.13 +++ CIMEventDispatcher.java 8 May 2013 17:30:35 -0000 1.14 @@ -1,7 +1,7 @@ /** * CIMEventDispatcher.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 @@ -24,6 +24,7 @@ * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2) * 3477087 2012-01-23 blaschke-oss Need Access to an Indication Sender's IP Address + * 2628 2013-03-26 blaschke-oss Limit size of LinkedList of CIMEvents to be dispatched */ package org.sblim.cimclient.internal.wbem.indications; @@ -48,6 +49,8 @@ private boolean iAlive = true; + private int iMaxEvents = 0; + private LogAndTraceBroker iLogger = LogAndTraceBroker.getBroker(); /** @@ -61,10 +64,27 @@ * dispatched. */ public CIMEventDispatcher(EventListener pListener) { + this(pListener, 0); + } + + /** + * Construct a CIMEventDispatcher object which distributes CIMEvents to the + * appropriate CIMListener. The EventListener must be an instance of + * IndicationListener or IndicationListenerSBLIM. + * + * @param pListener + * The CIMListener (IndicationListener or + * IndicationListenerSBLIM) which receives the CIMEvents to be + * dispatched. + * @param pMaxEvents + * The maximum number of CIMEvents waiting to be dispatched. + */ + public CIMEventDispatcher(EventListener pListener, int pMaxEvents) { if (!(pListener instanceof IndicationListener) && !(pListener instanceof IndicationListenerSBLIM)) throw new IllegalArgumentException( "Listener must be instance of IndicationListener or IndicationListenerSBLIM"); this.iListener = pListener; + this.iMaxEvents = pMaxEvents; setDaemon(true); setName("CIMEventDispatcher"); start(); @@ -79,9 +99,20 @@ public synchronized void dispatchEvent(CIMEvent pEvent) { if (pEvent != null) { + if (this.iMaxEvents > 0) { + int size = this.iEventQueue.size(); + if (size >= this.iMaxEvents) { + for (int i = size - this.iMaxEvents + 1; i > 0; i--) { + CIMEvent event = this.iEventQueue.remove(0); + this.iLogger.trace(Level.FINE, "Deleted CIMEvent (id=" + event.getID() + + ") from the queue (maximum size of " + this.iMaxEvents + + " reached)"); + } + } + } this.iEventQueue.add(pEvent); this.iLogger.trace(Level.FINE, "Added CIMEvent (id=" + pEvent.getID() - + " to the queue (" + this.iEventQueue.size() + " elements total)"); + + ") to the queue (" + this.iEventQueue.size() + " elements total)"); notify(); } else { this.iLogger.trace(Level.WARNING, "CIMEvent to dispatch was null"); @@ -122,7 +153,7 @@ if (this.iEventQueue.size() > 0) { event = this.iEventQueue.remove(0); this.iLogger.trace(Level.FINER, "Removed CIMEvent (id=" + event.getID() - + "from the queue (" + this.iEventQueue.size() + " elements left)"); + + ") from the queue (" + this.iEventQueue.size() + " elements left)"); } } return event; |
|
From: Dave B. <bla...@us...> - 2013-05-08 17:02:55
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4884/src/org/sblim/cimclient/doc-files Modified Files: Tag: Experimental unittest.html Log Message: 2636 Nested embedded instances cause CIMXMLParseException Index: unittest.html =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/doc-files/unittest.html,v retrieving revision 1.1.2.30 retrieving revision 1.1.2.31 diff -u -d -r1.1.2.30 -r1.1.2.31 --- unittest.html 23 Feb 2013 19:56:54 -0000 1.1.2.30 +++ unittest.html 8 May 2013 17:02:49 -0000 1.1.2.31 @@ -38,13 +38,14 @@ * 3596303 2013-01-04 blaschke-oss windows http response WWW-Authenticate: Negotiate fails * 3598613 2013-01-11 blaschke-oss different data type in cim instance and cim object path * 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication() + * 2636 2013-05-08 blaschke-oss Nested embedded instances cause CIMXMLParseException --> </head> <body style="background-color: white;"> <h1>Unit Test Coverage</h1> - <p>The SBLIM CIM Client for Java ships with a large collection of around 180 + <p>The SBLIM CIM Client for Java ships with a large collection of around 190 unit tests. Whenever you the "all" target is build with ant the complete unit test suite will be executed. This document describes what is covered by these tests.</p> @@ -179,6 +180,14 @@ sblim.wbem.synchronizeNumericKeyDataTypes is set to true.</td></tr> </table> +<h3>wbem.NestedEmbInstTest</h3> + <table border="1" cellpadding="5" cellspacing="0" width="100%"> + <tr><td>testEnumInstancesSAX/PULL/DOM</td> + <td>Parses a hand made enumerateInstances() response XML file and checks + that the embedded instances (that is, an instance within an instance + within an instance) are as expected.</td></tr> + </table> + <h3>wbem.WBEMClientTest</h3> <table border="1" cellpadding="5" cellspacing="0" width="100%"> <tr><td>testClientIsActive</td> |
|
From: Dave B. <bla...@us...> - 2013-05-08 17:02:52
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/wbem/data In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4884/utst/org/sblim/cimclient/unittest/wbem/data Added Files: Tag: Experimental NestedEmbInst.xml Log Message: 2636 Nested embedded instances cause CIMXMLParseException --- NEW FILE: NestedEmbInst.xml --- <?xml version="1.0" encoding="utf-8" ?> <CIM CIMVERSION="2.0" DTDVERSION="2.0"> <MESSAGE ID="1" PROTOCOLVERSION="1.0"> <SIMPLERSP> <IMETHODRESPONSE NAME="EnumerateInstances"> <IRETURNVALUE> <INSTANCE CLASSNAME="LMI_StorageInstModification"> <PROPERTY NAME="SourceInstanceHost" TYPE="string"> <VALUE>rawhide</VALUE> </PROPERTY> <PROPERTY NAME="SourceInstanceModelPath" TYPE="string"> <VALUE>//rawhide/root/cimv2:LMI_StorageJob.InstanceID="LMI:LMI_StorageJob:1"</VALUE> </PROPERTY> <PROPERTY NAME="SourceInstance" EmbeddedObject="object" TYPE="string"> <VALUE><INSTANCE CLASSNAME="LMI_StorageJob"> <PROPERTY NAME="MethodName" TYPE="string"> </PROPERTY> <PROPERTY NAME="JobOutParameters" EmbeddedObject="object" TYPE="string"> </PROPERTY> <PROPERTY NAME="JobInParameters" EmbeddedObject="object" TYPE="string"> <VALUE>&lt;INSTANCE CLASSNAME=&quot;CIM_ManagedElement&quot;&gt; &lt;PROPERTY NAME=&quot;Generation&quot; TYPE=&quot;uint64&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;ElementName&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;Description&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;Caption&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;InstanceID&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY.REFERENCE NAME=&quot;Partition&quot;&gt; &lt;/PROPERTY.REFERENCE&gt; &lt;PROPERTY.REFERENCE NAME=&quot;Goal&quot;&gt; &lt;/PROPERTY.REFERENCE&gt; &lt;PROPERTY.REFERENCE NAME=&quot;Extent&quot;&gt; &lt;VALUE.REFERENCE&gt; &lt;LOCALINSTANCEPATH&gt; &lt;LOCALNAMESPACEPATH&gt; &lt;NAMESPACE NAME=&quot;root&quot;/&gt; &lt;NAMESPACE NAME=&quot;cimv2&quot;/&gt; &lt;/LOCALNAMESPACEPATH&gt; &lt;INSTANCENAME CLASSNAME=&quot;CIM_StorageExtent&quot;&gt; &lt;KEYBINDING NAME=&quot;CreationClassName&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;LMI_StorageExtent&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;KEYBINDING NAME=&quot;SystemName&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;rawhide&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;KEYBINDING NAME=&quot;DeviceID&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-1&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;KEYBINDING NAME=&quot;SystemCreationClassName&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;Linux_ComputerSystem&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;/INSTANCENAME&gt; &lt;/LOCALINSTANCEPATH&gt; &lt;/VALUE.REFERENCE&gt; &lt;/PROPERTY.REFERENCE&gt; &lt;PROPERTY NAME=&quot;Size&quot; TYPE=&quot;uint64&quot;&gt; &lt;VALUE&gt;10000000&lt;/VALUE&gt; &lt;/PROPERTY&gt; &lt;/INSTANCE&gt; </VALUE> </PROPERTY> <PROPERTY NAME="InstanceID" TYPE="string"> <VALUE>LMI:LMI_StorageJob:1</VALUE> </PROPERTY> <PROPERTY NAME="Generation" TYPE="uint64"> </PROPERTY> <PROPERTY NAME="ElementName" TYPE="string"> </PROPERTY> <PROPERTY NAME="Description" TYPE="string"> <VALUE>CREATE PARTITION ON /dev/sdb</VALUE> </PROPERTY> <PROPERTY NAME="Caption" TYPE="string"> </PROPERTY> <PROPERTY NAME="InstallDate" TYPE="datetime"> </PROPERTY> <PROPERTY.ARRAY NAME="StatusDescriptions" TYPE="string"> </PROPERTY.ARRAY> <PROPERTY NAME="Status" TYPE="string"> </PROPERTY> <PROPERTY NAME="HealthState" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="CommunicationStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="DetailedStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="OperatingStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="PrimaryStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="JobStatus" TYPE="string"> </PROPERTY> <PROPERTY NAME="ScheduledStartTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="JobRunTimes" TYPE="uint32"> <VALUE>1</VALUE> </PROPERTY> <PROPERTY NAME="RunMonth" TYPE="uint8"> </PROPERTY> <PROPERTY NAME="RunDay" TYPE="sint8"> </PROPERTY> <PROPERTY NAME="RunDayOfWeek" TYPE="sint8"> </PROPERTY> <PROPERTY NAME="RunStartInterval" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="UntilTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="Notify" TYPE="string"> </PROPERTY> <PROPERTY NAME="Owner" TYPE="string"> </PROPERTY> <PROPERTY NAME="Priority" TYPE="uint32"> </PROPERTY> <PROPERTY NAME="ErrorCode" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="ErrorDescription" TYPE="string"> </PROPERTY> <PROPERTY NAME="RecoveryAction" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="OtherRecoveryAction" TYPE="string"> </PROPERTY> <PROPERTY NAME="DeleteOnCompletion" TYPE="boolean"> <VALUE>TRUE</VALUE> </PROPERTY> <PROPERTY NAME="ElapsedTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="JobState" TYPE="uint16"> <VALUE>4</VALUE> </PROPERTY> <PROPERTY NAME="LocalOrUtcTime" TYPE="uint16"> <VALUE>2</VALUE> </PROPERTY> <PROPERTY NAME="Name" TYPE="string"> <VALUE>CREATE PARTITION ON /dev/sdb</VALUE> </PROPERTY> <PROPERTY.ARRAY NAME="OperationalStatus" TYPE="uint16"> <VALUE.ARRAY> <VALUE>2</VALUE> </VALUE.ARRAY> </PROPERTY.ARRAY> <PROPERTY NAME="PercentComplete" TYPE="uint16"> <VALUE>50</VALUE> </PROPERTY> <PROPERTY NAME="StartTime" TYPE="datetime"> <VALUE>20130429103108.468050+000</VALUE> </PROPERTY> <PROPERTY NAME="TimeBeforeRemoval" TYPE="datetime"> <VALUE>00000000000100.000000:000</VALUE> </PROPERTY> <PROPERTY NAME="TimeOfLastStateChange" TYPE="datetime"> <VALUE>20130429103108.468089+000</VALUE> </PROPERTY> <PROPERTY NAME="TimeSubmitted" TYPE="datetime"> <VALUE>20130429103108.458642+000</VALUE> </PROPERTY> </INSTANCE> </VALUE> </PROPERTY> <PROPERTY NAME="IndicationIdentifier" TYPE="string"> </PROPERTY> <PROPERTY.ARRAY NAME="CorrelatedIndications" TYPE="string"> </PROPERTY.ARRAY> <PROPERTY NAME="IndicationTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="PerceivedSeverity" TYPE="uint16"> <VALUE>2</VALUE> </PROPERTY> <PROPERTY NAME="OtherSeverity" TYPE="string"> </PROPERTY> <PROPERTY NAME="IndicationFilterName" TYPE="string"> <VALUE>LMI:LMI_StorageJob:Changed</VALUE> </PROPERTY> <PROPERTY NAME="SequenceContext" TYPE="string"> <VALUE>sfcb:NO-UUID-FILE-rawhide#20130429103059#20130429103057</VALUE> </PROPERTY> <PROPERTY NAME="SequenceNumber" TYPE="sint64"> <VALUE>0</VALUE> </PROPERTY> <PROPERTY NAME="PreviousInstance" EmbeddedObject="object" TYPE="string"> <VALUE><INSTANCE CLASSNAME="LMI_StorageJob"> <PROPERTY NAME="MethodName" TYPE="string"> </PROPERTY> <PROPERTY NAME="JobOutParameters" EmbeddedObject="object" TYPE="string"> </PROPERTY> <PROPERTY NAME="JobInParameters" EmbeddedObject="object" TYPE="string"> <VALUE>&lt;INSTANCE CLASSNAME=&quot;CIM_ManagedElement&quot;&gt; &lt;PROPERTY NAME=&quot;Generation&quot; TYPE=&quot;uint64&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;ElementName&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;Description&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;Caption&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY NAME=&quot;InstanceID&quot; TYPE=&quot;string&quot;&gt; &lt;/PROPERTY&gt; &lt;PROPERTY.REFERENCE NAME=&quot;Partition&quot;&gt; &lt;/PROPERTY.REFERENCE&gt; &lt;PROPERTY.REFERENCE NAME=&quot;Goal&quot;&gt; &lt;/PROPERTY.REFERENCE&gt; &lt;PROPERTY.REFERENCE NAME=&quot;Extent&quot;&gt; &lt;VALUE.REFERENCE&gt; &lt;LOCALINSTANCEPATH&gt; &lt;LOCALNAMESPACEPATH&gt; &lt;NAMESPACE NAME=&quot;root&quot;/&gt; &lt;NAMESPACE NAME=&quot;cimv2&quot;/&gt; &lt;/LOCALNAMESPACEPATH&gt; &lt;INSTANCENAME CLASSNAME=&quot;CIM_StorageExtent&quot;&gt; &lt;KEYBINDING NAME=&quot;CreationClassName&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;LMI_StorageExtent&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;KEYBINDING NAME=&quot;SystemName&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;rawhide&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;KEYBINDING NAME=&quot;DeviceID&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-1&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;KEYBINDING NAME=&quot;SystemCreationClassName&quot;&gt; &lt;KEYVALUE VALUETYPE=&quot;string&quot;&gt;Linux_ComputerSystem&lt;/KEYVALUE&gt; &lt;/KEYBINDING&gt; &lt;/INSTANCENAME&gt; &lt;/LOCALINSTANCEPATH&gt; &lt;/VALUE.REFERENCE&gt; &lt;/PROPERTY.REFERENCE&gt; &lt;PROPERTY NAME=&quot;Size&quot; TYPE=&quot;uint64&quot;&gt; &lt;VALUE&gt;10000000&lt;/VALUE&gt; &lt;/PROPERTY&gt; &lt;/INSTANCE&gt; </VALUE> </PROPERTY> <PROPERTY NAME="InstanceID" TYPE="string"> <VALUE>LMI:LMI_StorageJob:1</VALUE> </PROPERTY> <PROPERTY NAME="Generation" TYPE="uint64"> </PROPERTY> <PROPERTY NAME="ElementName" TYPE="string"> </PROPERTY> <PROPERTY NAME="Description" TYPE="string"> <VALUE>CREATE PARTITION ON /dev/sdb</VALUE> </PROPERTY> <PROPERTY NAME="Caption" TYPE="string"> </PROPERTY> <PROPERTY NAME="InstallDate" TYPE="datetime"> </PROPERTY> <PROPERTY.ARRAY NAME="StatusDescriptions" TYPE="string"> </PROPERTY.ARRAY> <PROPERTY NAME="Status" TYPE="string"> </PROPERTY> <PROPERTY NAME="HealthState" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="CommunicationStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="DetailedStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="OperatingStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="PrimaryStatus" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="JobStatus" TYPE="string"> </PROPERTY> <PROPERTY NAME="ScheduledStartTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="JobRunTimes" TYPE="uint32"> <VALUE>1</VALUE> </PROPERTY> <PROPERTY NAME="RunMonth" TYPE="uint8"> </PROPERTY> <PROPERTY NAME="RunDay" TYPE="sint8"> </PROPERTY> <PROPERTY NAME="RunDayOfWeek" TYPE="sint8"> </PROPERTY> <PROPERTY NAME="RunStartInterval" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="UntilTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="Notify" TYPE="string"> </PROPERTY> <PROPERTY NAME="Owner" TYPE="string"> </PROPERTY> <PROPERTY NAME="Priority" TYPE="uint32"> </PROPERTY> <PROPERTY NAME="ErrorCode" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="ErrorDescription" TYPE="string"> </PROPERTY> <PROPERTY NAME="RecoveryAction" TYPE="uint16"> </PROPERTY> <PROPERTY NAME="OtherRecoveryAction" TYPE="string"> </PROPERTY> <PROPERTY NAME="DeleteOnCompletion" TYPE="boolean"> <VALUE>TRUE</VALUE> </PROPERTY> <PROPERTY NAME="ElapsedTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="JobState" TYPE="uint16"> <VALUE>2</VALUE> </PROPERTY> <PROPERTY NAME="LocalOrUtcTime" TYPE="uint16"> <VALUE>2</VALUE> </PROPERTY> <PROPERTY NAME="Name" TYPE="string"> <VALUE>CREATE PARTITION ON /dev/sdb</VALUE> </PROPERTY> <PROPERTY.ARRAY NAME="OperationalStatus" TYPE="uint16"> <VALUE.ARRAY> <VALUE>15</VALUE> </VALUE.ARRAY> </PROPERTY.ARRAY> <PROPERTY NAME="PercentComplete" TYPE="uint16"> <VALUE>0</VALUE> </PROPERTY> <PROPERTY NAME="StartTime" TYPE="datetime"> </PROPERTY> <PROPERTY NAME="TimeBeforeRemoval" TYPE="datetime"> <VALUE>00000000000100.000000:000</VALUE> </PROPERTY> <PROPERTY NAME="TimeOfLastStateChange" TYPE="datetime"> <VALUE>20130429103108.458642+000</VALUE> </PROPERTY> <PROPERTY NAME="TimeSubmitted" TYPE="datetime"> <VALUE>20130429103108.458642+000</VALUE> </PROPERTY> </INSTANCE> </VALUE> </PROPERTY> <PROPERTY.ARRAY NAME="ChangedPropertyNames" TYPE="string"> </PROPERTY.ARRAY> </INSTANCE> </IRETURNVALUE> </IMETHODRESPONSE> </SIMPLERSP> </MESSAGE> </CIM> |
|
From: Dave H. <hel...@us...> - 2013-05-03 15:22:22
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via d304919db4080ed1d3c921b3e20f759217540e4b (commit)
from 83c9e8c1d81e2827d7519f7265ea33e56370ae31 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d304919db4080ed1d3c921b3e20f759217540e4b
Author: Dave Heller <hel...@us...>
Date: Fri May 3 11:21:37 2013 -0400
[sfcb-tix:#45] HTTP verb check may fail producing 501 error
-----------------------------------------------------------------------
Summary of changes:
httpAdapter.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/httpAdapter.c b/httpAdapter.c
index 6f8e22d..cbceba2 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -690,7 +690,7 @@ static ChunkFunctions httpChunkFunctions = {
static int getHdrs(CommHndl conn_fd, Buffer * b, char *cmd)
{
- int first=1,total=0,isReady;
+ int checked=0,total=0,isReady;
fd_set httpfds;
int state=0;
@@ -727,14 +727,13 @@ static int getHdrs(CommHndl conn_fd, Buffer * b, char *cmd)
add2buffer(b, buf, r);
total+=r;
- /* on first run through, ensure that this is a POST req. */
- if (r && first) {
- if (strncasecmp(buf,cmd,strlen(cmd)) != 0) {
- /* not what we expected - still continue to read to
- not confuse the client */
+ /* Check that the HTTP verb is what we expect. If not,
+ continue to read anyway to not confuse the client. */
+ if (!checked && total >= strlen(cmd)) {
+ if (strncasecmp(b->data,cmd,strlen(cmd)) != 0) {
state = 1;
}
- first=0;
+ checked=1;
}
/* success condition: end of header */
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-05-02 20:19:53
|
Update of /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6994/utst/org/sblim/cimclient/unittest/cim Modified Files: Tag: Experimental CIMDataTypeTest.java Log Message: 2632 Potential Null Point Exception in CIMDataType Index: CIMDataTypeTest.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/utst/org/sblim/cimclient/unittest/cim/CIMDataTypeTest.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- CIMDataTypeTest.java 4 Dec 2012 19:40:16 -0000 1.1.2.4 +++ CIMDataTypeTest.java 2 May 2013 20:19:50 -0000 1.1.2.5 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2012 + * (C) Copyright IBM Corp. 2012, 2013 * * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE @@ -15,6 +15,7 @@ * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 * 3513349 2012-03-31 blaschke-oss TCK: CIMDataType must not accept null string * 3592502 2012-12-04 blaschke-oss Enhance CIMDataType unit test + * 2632 2013-05-02 blaschke-oss Potential Null Point Exception in CIMDataType */ package org.sblim.cimclient.unittest.cim; @@ -276,5 +277,22 @@ verify("Bad data type did not result in IllegalArgumentException", e instanceof IllegalArgumentException); } + + try { + type = CIMDataType.getDataType(new CIMObjectPath[] { null, null, this.copA[0] }); + verify( + "COP array with one non-null entry did not result in exception but type invalid: " + + type.getType(), type.getType() == CIMDataType.REFERENCE); + } catch (Exception e) { + verify("COP array with one non-null entry resulted in exception", false); + } + + try { + type = CIMDataType.getDataType(new CIMObjectPath[] { null, null, null }); + verify("COP array with all null entries did not result in exception", false); + } catch (Exception e) { + verify("COP array with all null entries did not result in IllegalArgumentException", + e instanceof IllegalArgumentException); + } } } |
|
From: Tyrel D. <ty...@us...> - 2013-05-02 04:21:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gather - Metric Data Gatherer".
The branch, master has been updated
via 3835ad76a630fef17cc4733360912a74a4af8d02 (commit)
from 32b8a6922c71a49676672156a65dc9d1a2bb6e5c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3835ad76a630fef17cc4733360912a74a4af8d02
Author: Tyrel Datwyler <ty...@li...>
Date: Wed May 1 21:18:47 2013 -0700
Fixed #2633: local FS metris calculated inconsitently
-----------------------------------------------------------------------
Summary of changes:
NEWS | 3 +++
plugin/metricLocalFileSystem.c | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/NEWS b/NEWS
index e7540fe..bb94222 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+Bugs fixed:
+- #2633 local FS metris calculated inconsitently
+
Changes in Version 2.2.8
========================
diff --git a/plugin/metricLocalFileSystem.c b/plugin/metricLocalFileSystem.c
index 7bbe243..ed75840 100644
--- a/plugin/metricLocalFileSystem.c
+++ b/plugin/metricLocalFileSystem.c
@@ -243,7 +243,7 @@ int metricRetrAvSpacePerc( int mid,
memset(fs, 0, sizeof (struct statfs) );
if (statfs(ptr_dir, fs) == 0) {
if( fs->f_blocks != 0 ) {
- size = (float)fs->f_bfree * 100 /
+ size = (float)fs->f_bavail * 100 /
(float)fs->f_blocks;
}
}
hooks/post-receive
--
gather - Metric Data Gatherer
|
|
From: Michael Chase-S. <mc...@us...> - 2013-04-30 22:14:09
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 322c116f79f92e2603b0afafffccc69aa6647e3c (commit)
from f0b2e535f2542ab42d9cf656670837e22917866f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 322c116f79f92e2603b0afafffccc69aa6647e3c
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Apr 30 18:13:34 2013 -0400
[sfcb-tix:#40] Add valgrind test
Add sample suppressions file
-----------------------------------------------------------------------
Summary of changes:
test/ABT/sfcb-suppressions | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/test/ABT/sfcb-suppressions b/test/ABT/sfcb-suppressions
new file mode 100644
index 0000000..2978609
--- /dev/null
+++ b/test/ABT/sfcb-suppressions
@@ -0,0 +1,44 @@
+# This is a sample valgrind suppressions file for use with sfcb,
+# specifically with the ABT test suite.
+# These stanzas supress some common cases where valgrind will think there
+# is a leak due to the tracked memory support in sfcb.
+#
+# In order to use this with ABT, copy this file to /tmp/sfcb-suppressions
+# before running sfcb.
+{
+ <newQLStatement>
+ Memcheck:Leak
+ ...
+ fun:newQLStatement
+}
+{
+ <addenc>
+ Memcheck:Leak
+ ...
+ fun:memAddEncObj
+}
+{
+ <addClStringN>
+ Memcheck:Leak
+ ...
+ fun:addClStringN
+}
+{
+ <ensureClSpace>
+ Memcheck:Leak
+ ...
+ fun:ensureClSpace
+}
+{
+ <__ift_clone>
+ Memcheck:Leak
+ ...
+ fun:__ift_clone
+}
+{
+ <clone>
+ Memcheck:Leak
+ ...
+ fun:clone
+}
+
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-04-30 17:10:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via f0b2e535f2542ab42d9cf656670837e22917866f (commit)
from 8d59a3be6a5cba4a2484932b77bd85ca705e7dab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f0b2e535f2542ab42d9cf656670837e22917866f
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Apr 30 13:08:44 2013 -0400
[sfcb-tix:#40] Add valgrind test
Tweaks to ABT invocation
-----------------------------------------------------------------------
Summary of changes:
test/ABT/ABTScript | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index 93d9139..26d0ec0 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -120,8 +120,15 @@ SFCB_VALGRIND()
# Check the Valgrind output if it's there
if [ -f /tmp/sfcb-vgout ]
then
- echo "Checking Valgrind output...."
- ./parseVG.pl
+ DUALOUT "Checking Valgrind output...."
+ if $BASE_DIR/sfcb/test/ABT/parseVG.pl >> $BASE_DIR/$REPORT_SUMMARY
+ then
+ DUALOUT "Complete"
+ else
+ DUALOUT "Complete"
+ RC=1
+ cp $BASE_DIR/sfcb/sfcbLeaks.txt $REPORTDIR
+ fi
fi
}
SFCB_TESTS()
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-04-29 23:30:04
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 8d59a3be6a5cba4a2484932b77bd85ca705e7dab (commit)
from db944f053c40f167120207958f8217cf5ded39fb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8d59a3be6a5cba4a2484932b77bd85ca705e7dab
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Apr 29 19:29:39 2013 -0400
[sfcb-tix:#40] Add valgrind test
Moving to ABT only
-----------------------------------------------------------------------
Summary of changes:
test/ABT/ABTScript | 1 -
test/finaltest/Makefile.am | 6 ------
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index 14a7697..93d9139 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -86,7 +86,6 @@ SFCB_START()
then
rm /tmp/sfcb-vgout
fi
- cp sfcb-vgsup.txt /tmp/
/usr/local/etc/init.d/sfcb start
if [ $? -eq 0 ] ; then
diff --git a/test/finaltest/Makefile.am b/test/finaltest/Makefile.am
index b8831d3..b176f5f 100644
--- a/test/finaltest/Makefile.am
+++ b/test/finaltest/Makefile.am
@@ -22,10 +22,4 @@
MAINTAINERCLEANFILES = Makefile.in
-if VALGRIND
-TESTS = parseVG.pl finalcheck.sh
-else
TESTS = finalcheck.sh
-endif
-
-
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-04-29 21:57:58
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via db944f053c40f167120207958f8217cf5ded39fb (commit)
from e871329340110213d9978c0bccb2e28b86ecf11c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit db944f053c40f167120207958f8217cf5ded39fb
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Apr 29 17:57:12 2013 -0400
[sfcb-tix:#40] Add valgrind test
Moving to ABT only
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
sfcb.init-none.in | 2 +-
test/ABT/ABTScript | 17 ++++++++++++-
test/ABT/parseVG.pl | 58 +++++++++++++++++++++++++++++++++++++++++++++
test/finaltest/parseVG.pl | 45 ----------------------------------
5 files changed, 76 insertions(+), 48 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0b903e9..9953c41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -316,7 +316,7 @@ if [test "$enable_tests"]; then
fi
if [test "$test_valgrind" == "yes"]; then
- PROFILER="$PROFILER valgrind --leak-check=full --xml=yes --xml-file=/tmp/sfcb-vgout.xml --child-silent-after-fork=yes"
+ PROFILER="$PROFILER touch /tmp/sfcb-suppressions \&\& valgrind --leak-check=full --log-file=/tmp/sfcb-vgout --trace-children=yes --suppressions=/tmp/sfcb-suppressions"
AC_SUBST(PROFILER)
KILLEXEC="-r memcheck.*"
AC_SUBST(KILLEXEC)
diff --git a/sfcb.init-none.in b/sfcb.init-none.in
index 3f6cf8a..70b8a63 100644
--- a/sfcb.init-none.in
+++ b/sfcb.init-none.in
@@ -23,7 +23,7 @@ stop() {
echo -n "Shutting down sfcb: "
if killall KILLEXEC
then
- sleep 3
+ sleep 5
# If it hasn't died gracefully, kill it
if killall -KILL KILLEXEC 2>/dev/null
then
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index e70cdca..14a7697 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -82,6 +82,12 @@ CVS_CHECK_OUT()
SFCB_START()
{
+ if [ -f /tmp/sfcb-vgout ]
+ then
+ rm /tmp/sfcb-vgout
+ fi
+ cp sfcb-vgsup.txt /tmp/
+
/usr/local/etc/init.d/sfcb start
if [ $? -eq 0 ] ; then
DUALOUT "SFCB start : SUCCESS"
@@ -110,7 +116,15 @@ SFCB_RESULTFILES()
find . -name "*.result" -print0 | xargs -0 -r -I file cp file --target-directory=$RESULTDIR --parents
fi
}
-
+SFCB_VALGRIND()
+{
+ # Check the Valgrind output if it's there
+ if [ -f /tmp/sfcb-vgout ]
+ then
+ echo "Checking Valgrind output...."
+ ./parseVG.pl
+ fi
+}
SFCB_TESTS()
{
n=$((n+1)) # Keep track of test iteration
@@ -220,6 +234,7 @@ BUILD_SFCB()
DUALOUT "SECOND TEST RUN:"
SFCB_TESTS
SFCB_STOP
+ SFCB_VALGRIND
SFCB_RESULTFILES
else
RC=1
diff --git a/test/ABT/parseVG.pl b/test/ABT/parseVG.pl
new file mode 100755
index 0000000..c5256b8
--- /dev/null
+++ b/test/ABT/parseVG.pl
@@ -0,0 +1,58 @@
+#!/usr/bin/perl
+
+use XML::Parser;
+use XML::LibXML;
+
+my $vgfile="/tmp/sfcb-vgout";
+my $leakfile="./sfcbLeaks.txt";
+my %ht;
+my $defCount=0;
+
+open VGO, '<', $vgfile or die "Can't open input file";
+my @contents = <VGO>;
+close VGO;
+
+#Split the output by PID, which is the first token on
+#each line
+foreach my $line (@contents)
+{
+ my ($pid,$txt)=split(/ /,$line,2);
+ push(@{$ht{$pid}},$txt);
+}
+
+#Prep the output file
+open(LEAKFILE,">$leakfile");
+
+#Look through the split up output for definite leaks
+foreach my $pid(keys %ht)
+{
+ my $leakfound=0;
+ foreach my $line (@{$ht{$pid}})
+ {
+ if ($leakfound && $line =~ /^$/){
+ #Blank line ends the stanza
+ print LEAKFILE $line;
+ $leakfound=0;
+ } elsif ($leakfound) {
+ #Still in the stanza, keep printing
+ print LEAKFILE $line;
+ } elsif ($line =~ m/.*are definitely lost.*/){
+ #Found a leak, print it and its stanza
+ #to the output file
+ print LEAKFILE $line;
+ $leakfound=1;
+ $defCount++;
+ }
+ }
+}
+close(LEAKFILE);
+
+# If we had any, note it and return the count, or 0 if none.
+if ($defCount) {
+ print(" FAILED $defCount definite leaks. See $leakfile\n");
+ exit($defCount);
+} else {
+ print(" PASSED no definite leaks.\n");
+ unlink($leakfile);
+ exit(0);
+}
diff --git a/test/finaltest/parseVG.pl b/test/finaltest/parseVG.pl
deleted file mode 100755
index aae5820..0000000
--- a/test/finaltest/parseVG.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/perl
-
-use XML::Parser;
-use XML::LibXML;
-
-my $xmlfile="/tmp/sfcb-vgout.xml";
-
-open XML, '<', $xmlfile or die "Can't open input file";
-my @contents = <XML>;
-close XML;
-
-@contents = grep(!/\/valgrindoutput/,@contents);
-push(@contents,"</valgrindoutput>");
-
-# Slurp and parse the valgrind xml output
-#$dom = XML::LibXML->load_xml(@contents);
-$dom = XML::LibXML->load_xml(
-# location => "/tmp/sfcb-vgout.xml"
- string => join(' ',@contents)
- );
-#Prep the output file
-my $leakfile="./sfcbLeaks.xml";
-open(LEAKFILE,">$leakfile");
-
-# Spin through the xml output looking for definite leaks
-my $defCount=0;
-foreach my $ele ($dom->findnodes('/valgrindoutput/error')) {
- my($kind) = $ele->findnodes('./kind');
- if ($kind =~ m/Leak_DefinitelyLost/) {
- print LEAKFILE "$ele\n";
- $defCount++;
- }
- }
-
-# If we had any, note it and return bad
-if ($defCount) {
- close(LEAKFILE);
- print(" FAILED $defCount definite leaks. See $leakfile\n");
- exit($defCount);
-}
-
-# If no leaks, cleanup
-unlink($leakfile);
-close(LEAKFILE);
-exit(0);
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2013-04-22 22:11:40
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via e871329340110213d9978c0bccb2e28b86ecf11c (commit)
from 55887c1db42af7da05efb54b5afffd7bd59bf3b2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e871329340110213d9978c0bccb2e28b86ecf11c
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Apr 22 18:11:06 2013 -0400
[sfcb-tix:#40] Add valgrind test
Error in init file creation
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index bd07712..0b903e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,6 +260,8 @@ AM_CONDITIONAL(PROVTEST,[test "$test_providers" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_local" == "yes"])
AM_CONDITIONAL(VALGRIND,[test "$test_valgrind"])
+KILLEXEC="sfcbd"
+AC_SUBST(KILLEXEC)
if [test "$enable_tests"]; then
# The order of TEST_SUBDIRS determines test
# execution order.
@@ -322,9 +324,6 @@ if [test "$enable_tests"]; then
TEST_SUBDIRS="$TEST_SUBDIRS finaltest"
AC_SUBST(TEST_SUBDIRS)
-else
- KILLEXEC="sfcbd"
- AC_SUBST(KILLEXEC)
fi
if [test "$test_gcov" == "yes"]; then
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave H. <hel...@us...> - 2013-04-19 03:15:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master_1.3 has been updated
via 83c9e8c1d81e2827d7519f7265ea33e56370ae31 (commit)
from b25098dc9bbb52d44887aaa9a82d991ee4114c01 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 83c9e8c1d81e2827d7519f7265ea33e56370ae31
Author: Dave Heller <hel...@us...>
Date: Thu Apr 18 23:06:33 2013 -0400
[sfcb-tix:#42] Run setupControl prior to getControl
-----------------------------------------------------------------------
Summary of changes:
control.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/control.c b/control.c
index 1faa547..60a4eaa 100644
--- a/control.c
+++ b/control.c
@@ -286,6 +286,11 @@ int getControlUNum(char *id, unsigned int *val)
{
Control *ctl;
int rc = -1;
+
+ if (ct == NULL) {
+ setupControl(configfile);
+ }
+
if ((ctl = ct->ft->get(ct, id))) {
if (ctl->type == 1 && isdigit(ctl->strValue[0])) {
unsigned long tmp = strtoul(ctl->strValue,NULL,0);
@@ -304,6 +309,11 @@ int getControlBool(char *id, int *val)
{
Control *ctl;
int rc = -1;
+
+ if (ct == NULL) {
+ setupControl(configfile);
+ }
+
if ((ctl = ct->ft->get(ct, id))) {
if (ctl->type == 2) {
*val = strcasecmp(ctl->strValue,"true")==0;
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
|
From: Dave B. <bla...@us...> - 2013-04-18 23:02:34
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15919/src/org/sblim/cimclient/internal/cimxml/sax/node Modified Files: Tag: Experimental ParameterRefArrayNode.java ParamValueNode.java Node.java Log Message: 2605 SAX parser throws wrong exception Index: ParameterRefArrayNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ParameterRefArrayNode.java,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -d -r1.1.2.7 -r1.1.2.8 --- ParameterRefArrayNode.java 23 Feb 2009 18:25:57 -0000 1.1.2.7 +++ ParameterRefArrayNode.java 18 Apr 2013 23:02:30 -0000 1.1.2.8 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (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 @@ -19,6 +19,7 @@ * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL * 2433593 2008-12-18 rgummada isArray returns true for method parameters of type reference * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) + * 2605 2013-03-20 buccella SAX parser throws wrong exception */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -26,6 +27,7 @@ import javax.cim.CIMDataType; import org.xml.sax.Attributes; +import org.xml.sax.SAXException; /** * <pre> @@ -48,7 +50,7 @@ } @Override - protected void specificInit(Attributes pAttribs) { + protected void specificInit(Attributes pAttribs) throws SAXException { this.iType = new CIMDataType(getReferenceClass(pAttribs), getArraySize(pAttribs)); } Index: Node.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/Node.java,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -u -d -r1.1.2.13 -r1.1.2.14 --- Node.java 30 Jan 2013 14:57:10 -0000 1.1.2.13 +++ Node.java 18 Apr 2013 23:02:30 -0000 1.1.2.14 @@ -24,6 +24,7 @@ * 2531371 2009-02-10 raman_arora Upgrade client to JDK 1.5 (Phase 2) * 3513353 2012-03-30 blaschke-oss TCK: CIMDataType arrays must have length >= 1 * 3602604 2013-01-29 blaschke-oss Clean up SAXException messages + * 2605 2013-03-20 buccella SAX parser throws wrong exception */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -216,12 +217,13 @@ * * @param pAttribs * @return int + * @throws SAXException */ - public static int getArraySize(Attributes pAttribs) { + public static int getArraySize(Attributes pAttribs) throws SAXException { String arraySizeStr = pAttribs.getValue("ARRAYSIZE"); // 0 - unbounded size int size = arraySizeStr == null ? 0 : Integer.parseInt(arraySizeStr); - if (size < 0) throw new IllegalArgumentException("ARRAYSIZE cannot be " + size + "!"); + if (size < 0) throw new SAXException("ARRAYSIZE cannot be " + size + "!"); return size; } Index: ParamValueNode.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/ParamValueNode.java,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -d -r1.1.2.10 -r1.1.2.11 --- ParamValueNode.java 1 Jun 2009 17:01:10 -0000 1.1.2.10 +++ ParamValueNode.java 18 Apr 2013 23:02:30 -0000 1.1.2.11 @@ -1,5 +1,5 @@ /** - * (C) Copyright IBM Corp. 2006, 2009 + * (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 @@ -21,6 +21,7 @@ * 2003590 2008-06-30 blaschke-oss Change licensing from CPL to EPL * 2524131 2009-01-21 raman_arora Upgrade client to JDK 1.5 (Phase 1) * 2797550 2009-06-01 raman_arora JSR48 compliance - add Java Generics + * 2605 2013-03-20 buccella SAX parser throws wrong exception */ package org.sblim.cimclient.internal.cimxml.sax.node; @@ -94,7 +95,7 @@ CIMDataType rawType = this.iEmbObjHandler.getRawType(); if (rawType != null) { if (pNodeNameEnum == VALUE_REFERENCE || pNodeNameEnum == VALUE_REFARRAY) { - if (rawType.getType() != CIMDataType.REFERENCE) throw new IllegalArgumentException( + if (rawType.getType() != CIMDataType.REFERENCE) throw new SAXException( "PARAMVALUE node's PARAMTYPE attribute is not reference (" + rawType + "), but a " + pNodeNameEnum + " child node is found!"); } |
|
From: Michael Chase-S. <mc...@us...> - 2013-04-18 02:45:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sfcb - Small Footprint CIM Broker".
The branch, master has been updated
via 55887c1db42af7da05efb54b5afffd7bd59bf3b2 (commit)
from 26268169668ec7f7ef549965f2135cd8fe4b286f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 55887c1db42af7da05efb54b5afffd7bd59bf3b2
Author: Michael Chase-Salerno <br...@li...>
Date: Wed Apr 17 22:44:26 2013 -0400
[#sfcb-tix:41] Global IndicationService
-----------------------------------------------------------------------
Summary of changes:
instance.c | 7 +++
interopServerProvider.c | 129 +++++++++--------------------------------------
sfcbmacs.h | 1 +
support.h | 1 +
4 files changed, 33 insertions(+), 105 deletions(-)
diff --git a/instance.c b/instance.c
index 5d3507f..1cb5755 100644
--- a/instance.c
+++ b/instance.c
@@ -145,6 +145,13 @@ memLinkInstance(CMPIInstance *ci)
memLinkEncObj(i, &i->mem_state);
}
+void
+memUnlinkInstance(CMPIInstance *ci)
+{
+ struct native_instance *i = (struct native_instance *) ci;
+ memUnlinkEncObj(i->mem_state);
+}
+
static int
__contained_list(char **list, const char *name)
{
diff --git a/interopServerProvider.c b/interopServerProvider.c
index a2afdfc..4760229 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -58,6 +58,7 @@
static const CMPIBroker *_broker;
static CMPIStatus invClassSt = { CMPI_RC_ERR_INVALID_CLASS, NULL };
+static CMPIInstance *ISinst; //Global instance for IndicationService
// ------------------------------------------------------------------
@@ -453,25 +454,8 @@ IndServiceProviderGetInstance(CMPIInstanceMI * mi,
_SFCB_RETURN(st);
}
-#ifdef SETTABLERETRY
-
- /* check if it exists first */
- CMPIContext *ctxLocal;
- ctxLocal = native_clone_CMPIContext(ctx);
- CMPIValue val;
- val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL,0);
- ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
-
- ci = CBGetInstance(_broker, ctxLocal, ref, properties, &st);
-
-#else
-
- ci = CMNewInstance(_broker, op, &st);
-
- makeIndService(ci);
-
-#endif
-
+ ci = ISinst->ft->clone(ISinst, &st);
+ memLinkInstance(ci);
if (properties) {
ci->ft->setPropertyFilter(ci, properties, NULL);
}
@@ -493,37 +477,8 @@ IndServiceProviderEnumInstances(CMPIInstanceMI * mi,
_SFCB_ENTER(TRACE_PROVIDERS, "IndServiceProviderEnumInstances");
-#ifdef SETTABLERETRY
-
- CMPIObjectPath *op;
- CMPIEnumeration *indServices = NULL;
- CMPIContext *ctxLocal;
- ctxLocal = native_clone_CMPIContext(ctx);
- CMPIValue val;
- CMPIInstance *ci=NULL;
- val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL,0);
- ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
-
- op = CMNewObjectPath(_broker, "root/interop", "CIM_IndicationService",
- NULL);
- indServices = CBEnumInstances(_broker, ctxLocal, op, properties, &st);
-
- while (CMHasNext(indServices, NULL)) {
- ci=CMGetNext(indServices, NULL).value.inst;
- if (properties) {
- ci->ft->setPropertyFilter(ci, properties, NULL);
- }
- CMReturnInstance(rslt, ci);
- }
+ CMReturnInstance(rslt, ISinst);
CMReturnDone(rslt);
-
- if (ctxLocal)
- CMRelease(ctxLocal);
-
-#else
- st = IndServiceProviderGetInstance(mi, ctx, rslt, NULL, properties);
-#endif
-
_SFCB_RETURN(st);
}
@@ -726,6 +681,7 @@ static CMPIStatus
ServerProviderCleanup(CMPIInstanceMI * mi, const CMPIContext *ctx,
CMPIBoolean terminate)
{
+ CMRelease(ISinst);
return okSt;
}
@@ -831,11 +787,12 @@ ServerProviderModifyInstance(CMPIInstanceMI * mi,
const char **properties)
{
CMPIStatus rc = notSupSt;
- CMPIContext *ctxLocal;
- CMPIValue val;
if (!CMClassPathIsA(_broker, cop, "cim_indicationservice", NULL))
return rc;
+ // Check that we have the right OP for IndicationService
+ if ( objectpathCompare(cop,ISinst->ft->getObjectPath(ISinst,NULL)))
+ return notFoundSt;
// Get the settable props
int settable=0;
@@ -859,15 +816,11 @@ ServerProviderModifyInstance(CMPIInstanceMI * mi,
if (settable > 0) return rc;
// Ok, all is well to continue with the operation...
- ctxLocal = native_clone_CMPIContext(ctx);
- val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL, 0);
- ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
- rc = CBModifyInstance(_broker, ctxLocal, cop, ci, properties);
- if (ctxLocal)
- CMRelease(ctxLocal);
+ // Just replace the global instance with the new one.
+ ISinst=ci->ft->clone(ci,NULL);
CMReturnInstance(rslt, ci);
- return rc;
-}
+ return okSt;
+}
/* ServerProviderDeleteInstance */
static CMPIStatus notSupCMPI_DI(ServerProvider);
@@ -879,34 +832,12 @@ void
ServerProviderInitInstances(const CMPIContext *ctx)
{
- /* only applicable if we're relying on InternalProvider */
-#ifdef SETTABLERETRY
-
CMPIStatus st;
- CMPIInstance *ci;
- CMPIObjectPath *op;
-
- CMPIValue val;
- CMPIContext *ctxLocal;
-
- ctxLocal = native_clone_CMPIContext(ctx);
- val.string = sfcb_native_new_CMPIString("$DefaultProvider$", NULL, 0);
- ctxLocal->ft->addEntry(ctxLocal, "rerouteToProvider", &val, CMPI_string);
-
- op = makeIndServiceOP();
-
- /* a brutal way to update values; because of this, changes don't persist */
- CBDeleteInstance(_broker,ctxLocal,op);
- ci = CMNewInstance(_broker, op, &st);
-
- makeIndService(ci);
-
- op = CMGetObjectPath(ci, &st);
-
- CBCreateInstance(_broker, ctxLocal, op, ci, &st);
- CMRelease(ctxLocal);
-#endif
-
+ CMPIObjectPath *ISop = makeIndServiceOP();
+ // This instance is always recreated, changes don't persist
+ ISinst = CMNewInstance(_broker, ISop, &st);
+ makeIndService(ISinst);
+ memUnlinkInstance(ISinst); // Prevent cleanup of the instance
return;
}
@@ -1168,18 +1099,14 @@ makeElementConforms(CMPIAssociationMI * mi,
CMPIObjectPath * rpop,
const char **propertyList, const char *target)
{
- CMPIEnumeration *isenm = NULL;
CMPIStatus rc = { CMPI_RC_OK, NULL };
CMPIInstance *eci = NULL;
- // Get the single instance of IndicationService
- isenm = _broker->bft->enumerateInstanceNames(_broker, ctx, isop, &rc);
- CMPIData isinst = CMGetNext(isenm, &rc);
- // Get the IndicationProfile instance of RegisteredProfile
CMAddKey(rpop, "InstanceID", "CIM:SFCB_IP", CMPI_chars);
// Create an instance
eci = CMNewInstance(_broker, ecop, &rc);
- CMSetProperty(eci, "ManagedElement", &(isinst.value), CMPI_ref);
+ CMPIValue ISval = {.ref = ISinst->ft->getObjectPath(ISinst,NULL) };
+ CMSetProperty(eci, "ManagedElement", &(ISval), CMPI_ref);
CMSetProperty(eci, "ConformantStandard", &(rpop), CMPI_ref);
if (strcasecmp(target, "Refs") == 0) {
if (propertyList) {
@@ -1191,8 +1118,6 @@ makeElementConforms(CMPIAssociationMI * mi,
}
if (eci)
CMRelease(eci);
- if (isenm)
- CMRelease(isenm);
CMReturnDone(rslt);
CMReturn(CMPI_RC_OK);
}
@@ -1323,8 +1248,6 @@ static CMPIStatus handleAssocHostedService(CMPIAssociationMI* mi,
&& (CMClassPathIsA(_broker, cop, "cim_system", &rc) == 1)) {
// A CIM_System was passed in so wee need to return either the
// CIM_IndicationService instance or a CIM_HostedService association
- //
- //
// instance
if (((strcasecmp(target, "Assocs") == 0)
|| (strcasecmp(target, "AssocNames") == 0))
@@ -1332,20 +1255,16 @@ static CMPIStatus handleAssocHostedService(CMPIAssociationMI* mi,
|| (strcasecmp(resultClass, "CIM_IndicationService") ==
0))) {
// Return the CIM_IndicationService instance
- CMPIEnumeration* isenm =
- _broker->bft->enumerateInstances(_broker, ctx, isop, NULL,
- &rc);
- CMPIData inst = CMGetNext(isenm, &rc);
+ CMPIInstance *inst = ISinst->ft->clone(ISinst,NULL);
+ memLinkInstance(inst);
if (strcasecmp(target, "Assocs") == 0) {
if (propertyList) {
- CMSetPropertyFilter(inst.value.inst, propertyList, NULL);
+ CMSetPropertyFilter(inst, propertyList, NULL);
}
- CMReturnInstance(rslt, (inst.value.inst));
+ CMReturnInstance(rslt,inst);
} else {
- CMReturnObjectPath(rslt, CMGetObjectPath(inst.value.inst, NULL));
+ CMReturnObjectPath(rslt, CMGetObjectPath(inst, NULL));
}
- if (isenm)
- CMRelease(isenm);
} else if (resultClass == NULL
|| (strcasecmp(resultClass, "CIM_HostedService") == 0)) {
// Return the CIM_HostedService instance
diff --git a/sfcbmacs.h b/sfcbmacs.h
index c583c6b..3a1d5c6 100644
--- a/sfcbmacs.h
+++ b/sfcbmacs.h
@@ -4,6 +4,7 @@
static CMPIStatus __attribute__ ((unused)) notSupSt = { CMPI_RC_ERR_NOT_SUPPORTED, NULL };
static CMPIStatus __attribute__ ((unused)) okSt = { CMPI_RC_OK, NULL };
+static CMPIStatus __attribute__ ((unused)) notFoundSt = { CMPI_RC_ERR_NOT_FOUND, NULL };
#define notSupCMPI_EQ(pfx) \
pfx##ExecQuery(CMPIInstanceMI __attribute__ ((unused)) *mi, \
diff --git a/support.h b/support.h
index b98a1f9..92adf78 100644
--- a/support.h
+++ b/support.h
@@ -196,6 +196,7 @@ void *memAddEncObj(int mode, void *ptr, size_t size, int *memId);
void memUnlinkEncObj(int memId);
void memLinkEncObj(void *ptr, int *memId);
void memLinkInstance(CMPIInstance *ci);
+void memUnlinkInstance(CMPIInstance *ci);
UtilList *memAddUtilList(UtilList* ul);
void *markHeap();
hooks/post-receive
--
sfcb - Small Footprint CIM Broker
|
