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

[Michael Chase-S. <mc...@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  c771406bc307ec5f668d6f811ead221394a6c796 (commit)
       via  38b8a9633ee3d0100db5eab31b1c69a192314851 (commit)
       via  e41f750dc7af783a8110d312a4aee5c2773bce4a (commit)
      from  b6ad6f083b0aaa8a3885275107a657959405ce5e (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 c771406bc307ec5f668d6f811ead221394a6c796
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 16:51:24 2012 -0500

    [ 3484083] Exclude SFCBIndicationID

commit 38b8a9633ee3d0100db5eab31b1c69a192314851
Merge: e41f750 b6ad6f0
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 16:37:41 2012 -0500

    Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb

commit e41f750dc7af783a8110d312a4aee5c2773bce4a
Author: Michael Chase-Salerno <br...@li...>
Date:   Thu Mar 1 16:36:38 2012 -0500

    3484083 Exclude SFCBIndicationID

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a8a5eaa..4015dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLHandler.c, indRetryTest.sh
+	[ 3484083] Exclude SFCBIndicationID 
+
 2012-03-01  Chris Buccella  <buc...@li...>
 
 	* interopProvider.c:
diff --git a/indCIMXMLHandler.c b/indCIMXMLHandler.c
index 3a827fe..5dfeb0b 100644
--- a/indCIMXMLHandler.c
+++ b/indCIMXMLHandler.c
@@ -978,6 +978,8 @@ IndCIMXMLHandlerInvokeMethod(CMPIMethodMI * mi,
       iop=CMGetObjectPath(ind,NULL);
       CMAddKey(iop,"SFCB_IndicationID",&indID,CMPI_uint32);
       CMSetProperty(ind,"SFCB_IndicationID",&indID,CMPI_uint32);
+      // Prevent this property from showing up in the indication
+      filterFlagProperty(ind, "SFCB_IndicationID");
       sub=CMGetArg(in,"subscription",NULL).value.inst;
       CMPIData handler=CMGetProperty(sub, "Handler", &st);
       CMPIObjectPath *hop=handler.value.ref;
diff --git a/test/TestProviders/tests/IndRetryTest.sh b/test/TestProviders/tests/IndRetryTest.sh
index bc21ca5..62ecc29 100755
--- a/test/TestProviders/tests/IndRetryTest.sh
+++ b/test/TestProviders/tests/IndRetryTest.sh
@@ -311,6 +311,12 @@ else
     echo " received $count of $lim: FAILED"
     RC=1
 fi
+count=$(grep SFCB_IndicationID $ODIR/SFCB_Listener.txt  | wc -l)
+if [ $count -ne 0 ] 
+then
+    echo " SFCB_IndicationID property found: FAILED"
+    RC=1
+fi
 
 # Check sequence numbers
 echo -n  "  Indication flood sequence numbers: "


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