[Sblim-commit] sfcb ChangeLog, 1.732, 1.733 NEWS, 1.655, 1.656 indCIMXMLHandler.c, 1.45, 1.46

[Michael Chase-S. <mc...@us...>]

Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv28155

Modified Files:
	ChangeLog NEWS indCIMXMLHandler.c 
Log Message:
[ 3498044 ] RIEnabled conflicts with settable retries


Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -d -r1.655 -r1.656
--- NEWS	7 Mar 2012 05:55:42 -0000	1.655
+++ NEWS	7 Mar 2012 17:12:39 -0000	1.656
@@ -46,6 +46,7 @@
 - 3497765 Better Error Handling in sfcb Provider Manager and Driver
 - 3497950 SFCB Semaphore Handling Improvements
 - 3498275 Remove __Namespace
+- 3498044 RIEnabled conflicts with settable retries
 
 Changes in 1.3.13
 =================

Index: indCIMXMLHandler.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/indCIMXMLHandler.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- indCIMXMLHandler.c	1 Mar 2012 23:56:43 -0000	1.45
+++ indCIMXMLHandler.c	7 Mar 2012 17:12:39 -0000	1.46
@@ -854,14 +854,18 @@
    if (interOpNameSpace(ref,&st)==0) _SFCB_RETURN(st);
    
    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);
       CMPIContext    *ctxLocal=NULL;

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.732
retrieving revision 1.733
diff -u -d -r1.732 -r1.733
--- ChangeLog	7 Mar 2012 05:55:42 -0000	1.732
+++ ChangeLog	7 Mar 2012 17:12:39 -0000	1.733
@@ -1,3 +1,8 @@
+2012-03-07 Michael Chase-Salerno <br...@li...>
+
+	* indCIMXMLHandler.c:
+	[ 3498044 ] RIEnabled conflicts with settable retries
+
 2012-03-07  Chris Buccella  <buc...@li...>
 
 	* 10_interop.mof, default.reg.in, interopServerProvider.c:
@@ -15,12 +20,12 @@
 
 2012-03-05  Narasimhma Sharoff  <nsh...@us...>
 
-	* providerDrv.c, providerMgr.c, sfcBroker.c
+	* providerDrv.c, providerMgr.c, sfcBroker.c:
 	[ 3497096 ] double free during stopProc
 
 2012-03-05  Narasimhma Sharoff  <nsh...@us...>
 
-	* providerDrv.c, providerMgr.c, providerMgr.h, support.c
+	* providerDrv.c, providerMgr.c, providerMgr.h, support.c:
 	[ 3416060 ] sigsegv in tool_mm_flush()
 
 2012-03-02  Chris Buccella  <buc...@li...>
@@ -30,7 +35,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...>
@@ -40,7 +45,7 @@
 
 2012-03-01 Narasimha Sharoff <nsh...@us...>
 
-	* brokerUpc.c
+	* brokerUpc.c:
 	[ 3483200 ] duplicate indication deliveries
 
 2012-02-29  Chris Buccella  <buc...@li...>
@@ -59,7 +64,7 @@
 
 2012-02-29 Narasimha Sharoff <nsh...@us...>
 
-	* indCIMXMLHandler.c, interopProvider.c
+	* indCIMXMLHandler.c, interopProvider.c:
 	[ 3495060 ] verify filter and handler information during subscription
 
 2012-02-29 Dave Heller <hel...@us...>
@@ -79,7 +84,7 @@
 
 2012-02-24  Chris Buccella  <buc...@li...>
 
-	* Makefile.am, sfcbsem.c
+	* Makefile.am, sfcbsem.c:
 	[ 3493493 ] Add sfcbsem
 	(code by Viktor Mihajlovski)