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

[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  3ed344550a9d63787266bfbf8e1a942fbdb828de (commit)
       via  eb37fafe658b597f2d9bf2d183a7a760f7ac5fe7 (commit)
       via  2fb79cfb4116761b6f51ea714971f4ec8566b5e0 (commit)
      from  0d2442510d80a84be391c1ccdfccd540c3296c13 (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 3ed344550a9d63787266bfbf8e1a942fbdb828de
Author: Michael Chase-Salerno <br...@li...>
Date:   Tue Mar 6 18:04:09 2012 -0500

    [ 3498044 ] RIEnabled conflicts with settable retries

commit eb37fafe658b597f2d9bf2d183a7a760f7ac5fe7
Merge: 2fb79cf 0d24425
Author: Michael Chase-Salerno <br...@li...>
Date:   Tue Mar 6 18:02:21 2012 -0500

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

commit 2fb79cfb4116761b6f51ea714971f4ec8566b5e0
Author: Michael Chase-Salerno <br...@li...>
Date:   Tue Mar 6 18:01:01 2012 -0500

    3498044 RIEnabled conflicts with settable retries

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

Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 63fa2d8..c6154ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLHandler.c:
+	[ 3498044 ] RIEnabled conflicts with settable retries
+
 2012-03-06  Chris Buccella  <buc...@li...>
 
 	* providerDrv.c, providerMgr.c:
@@ -20,7 +25,7 @@
 
 2012-03-01 Michael Chase-Salerno <br...@li...>
 
-	* indCIMXMLHandler.c, indRetryTest.sh
+	* indCIMXMLHandler.c, indRetryTest.sh:
 	[ 3484083] Exclude SFCBIndicationID 
 
 2012-03-01  Chris Buccella  <buc...@li...>
diff --git a/indCIMXMLHandler.c b/indCIMXMLHandler.c
index 5dfeb0b..053f1bb 100644
--- a/indCIMXMLHandler.c
+++ b/indCIMXMLHandler.c
@@ -957,14 +957,18 @@ IndCIMXMLHandlerInvokeMethod(CMPIMethodMI * mi,
 
   if (strcasecmp(methodName, "_deliver") == 0) {
 
+#ifndef SETTABLERETRY
     // On the first indication, check if reliable indications are enabled.
     if (RIEnabled == -1) {
+#endif
       CMPIObjectPath *op=CMNewObjectPath(_broker,"root/interop","CIM_IndicationService",NULL);
       CMPIEnumeration *isenm = _broker->bft->enumerateInstances(_broker, ctx, op, NULL, NULL);
       CMPIData isinst=CMGetNext(isenm,NULL);
       CMPIData mc=CMGetProperty(isinst.value.inst,"DeliveryRetryAttempts",NULL);
       RIEnabled=mc.value.uint16;
+#ifndef SETTABLERETRY
     }
+#endif
 
     CMPIInstance *indo=CMGetArg(in,"indication",NULL).value.inst;
     CMPIInstance *ind=CMClone(indo,NULL);


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