osaf/services/saf/immsv/immnd/ImmModel.cc |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


The patch adds missing code from ticket #801 that is required for IMM SC 
absence allowed

diff --git a/osaf/services/saf/immsv/immnd/ImmModel.cc 
b/osaf/services/saf/immsv/immnd/ImmModel.cc
--- a/osaf/services/saf/immsv/immnd/ImmModel.cc
+++ b/osaf/services/saf/immsv/immnd/ImmModel.cc
@@ -533,17 +533,21 @@ immModel_abortNonCriticalCcbs(IMMND_CB *
 {
     SaUint32T arrSize;
     SaUint32T* implConnArr = NULL;
-    SaUint32T client;
+    SaUint32T* clientArr = NULL;
+    SaUint32T clientArrSize = 0;
     SaClmNodeIdT pbeNodeId;
     SaUint32T nodeId;
     CcbVector::iterator i3 = sCcbVector.begin();
     for(; i3!=sCcbVector.end(); ++i3) {
         if((*i3)->mState < IMM_CCB_CRITICAL) {
-            osafassert(immModel_ccbAbort(cb, (*i3)->mId, &arrSize, 
&implConnArr, &client, &nodeId, &pbeNodeId));
+            osafassert(immModel_ccbAbort(cb, (*i3)->mId, &arrSize, 
&implConnArr, &clientArr, &clientArrSize, &nodeId, &pbeNodeId));
             osafassert(immModel_ccbFinalize(cb, (*i3)->mId) == SA_AIS_OK);
             if (arrSize) {
                 free(implConnArr);
             }
+            if (clientArrSize) {
+                free(clientArr);
+            }
         }
     }
 }

------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to