[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-260-g13f7c12

[Chris B. <buc...@us...>]

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  13f7c1262b5b6170ce17e89242c1da0585c44fba (commit)
      from  d2a83f4428ca7e82afc72eafb6616af0e94cb45d (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 13f7c1262b5b6170ce17e89242c1da0585c44fba
Author: buccella <buc...@li...>
Date:   Thu May 17 17:00:56 2012 -0400

    [ 3527693 ] Property filters don't work for enum upcalls

-----------------------------------------------------------------------

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index c271ea1..a3550b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2012-05-17  Chris Buccella  <buc...@li...>
 
+	* brokerUpc.c, 
+	test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.*:
+	[ 3527693 ] Property filters don't work for enum upcalls
+	(patch by Tyrel Datwyler)
+
 	* classProviderGz.c, httpAdapter.c, interopProvider.c,
 	msgqueue.c, msgqueue.h, providerMgr.c:
 	[ 3527674 ] Faster Startup
diff --git a/NEWS b/NEWS
index 8969355..196a512 100644
--- a/NEWS
+++ b/NEWS
@@ -103,6 +103,7 @@ Bugs Fixed:
 - 3516184 commClose close socket when file hndl is null
 - 3517573 Problem with SequenceContext migration
 - 3525651 CMSetPropertyFilter not CMPI 2.0 compliant
+- 3527693 Property filters don't work for enum upcalls
 
 Changes in 1.3.14
 =================
diff --git a/brokerUpc.c b/brokerUpc.c
index 6f50c19..1abe89f 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -373,7 +373,8 @@ genericEnumRequest(const CMPIBroker * broker,
   int             initrc = 0;
   int             irc,
                   c,
-                  i = -1;
+                  i = -1,
+                  cnt = bhdr->count;
 
   _SFCB_ENTER(TRACE_UPCALLS, "genericEnumRequest");
 
@@ -389,7 +390,7 @@ genericEnumRequest(const CMPIBroker * broker,
       sreqSize += i * sizeof(MsgSegment);
       i = -1;
       while (props[++i]) {
-        bhdr->object[i + 2] = setCharsMsgSegment(props[i]);
+        bhdr->object[i + cnt] = setCharsMsgSegment(props[i]);
       }
       bhdr->count += i;
     }
diff --git a/test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.lines b/test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.lines
new file mode 100644
index 0000000..6333abd
--- /dev/null
+++ b/test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.lines
@@ -0,0 +1,4 @@
+<PROPERTY NAME="FilterCreationEnabled" TYPE="boolean">
+<VALUE>TRUE</VALUE>
+</PROPERTY>
+</INSTANCE>
diff --git a/test/TestProviders/tests/RIEnumIS.XML b/test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.xml
similarity index 78%
copy from test/TestProviders/tests/RIEnumIS.XML
copy to test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.xml
index 36c0ff7..9c893ff 100644
--- a/test/TestProviders/tests/RIEnumIS.XML
+++ b/test/xmltest/enumerateInstance_CIM_IndicationService-propertyFilter.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <CIM CIMVERSION="2.0" DTDVERSION="2.0">
 <MESSAGE ID="4711" PROTOCOLVERSION="1.0"><SIMPLEREQ><IMETHODCALL NAME="EnumerateInstances"><LOCALNAMESPACEPATH><NAMESPACE NAME="root"></NAMESPACE><NAMESPACE NAME="interop"></NAMESPACE></LOCALNAMESPACEPATH>
-<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="CIM_IndicationService"/></IPARAMVALUE>
+<IPARAMVALUE NAME="ClassName"><CLASSNAME NAME="cim_indicationservice"/></IPARAMVALUE>
 <IPARAMVALUE NAME="DeepInheritance"><VALUE>TRUE</VALUE></IPARAMVALUE>
 <IPARAMVALUE NAME="LocalOnly"><VALUE>FALSE</VALUE></IPARAMVALUE>
 <IPARAMVALUE NAME="IncludeQualifiers"><VALUE>FALSE</VALUE></IPARAMVALUE>
 <IPARAMVALUE NAME="IncludeClassOrigin"><VALUE>TRUE</VALUE></IPARAMVALUE>
+<IPARAMVALUE NAME="PropertyList"><VALUE.ARRAY><VALUE>FilterCreationEnabled</VALUE></VALUE.ARRAY></IPARAMVALUE>
 </IMETHODCALL></SIMPLEREQ>
 </MESSAGE></CIM>


hooks/post-receive
-- 
SFCB - Small Footprint CIM Broker