---
src/amf/amfd/imm.cc | 2 +-
src/amf/amfnd/avnd_util.h | 2 +-
src/amf/amfnd/util.cc | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/amf/amfd/imm.cc b/src/amf/amfd/imm.cc
index 5e8679c3f..baf646c92 100644
--- a/src/amf/amfd/imm.cc
+++ b/src/amf/amfd/imm.cc
@@ -524,7 +524,7 @@ static const SaImmOiImplementerNameT implementerName =
(SaImmOiImplementerNameT) "safAmfService";
static const SaImmOiImplementerNameT applierNamePrefix =
(SaImmOiImplementerNameT) "@safAmfService";
-static SaVersionT immVersion = {'A', 2, 15};
+static const SaVersionT immVersion = {'A', 2, 15};
/* This string array must match the AVSV_AMF_CLASS_ID enum */
static const char *avd_class_names[] = {"Invalid",
diff --git a/src/amf/amfnd/avnd_util.h b/src/amf/amfnd/avnd_util.h
index 3add13aae..247ee9ee1 100644
--- a/src/amf/amfnd/avnd_util.h
+++ b/src/amf/amfnd/avnd_util.h
@@ -63,7 +63,7 @@ void free_n2d_nd_csicomp_state_info(AVSV_DND_MSG *msg);
void free_n2d_nd_sisu_state_info(AVSV_DND_MSG *msg);
SaAisErrorT saImmOmInitialize_cond(SaImmHandleT *immHandle,
const SaImmCallbacksT *immCallbacks,
- SaVersionT *version);
+ const SaVersionT *version);
uint32_t avnd_cpy_SU_DN_from_DN(std::string &, const std::string &);
SaAisErrorT amf_saImmOmAccessorInitialize(SaImmHandleT &immHandle,
SaImmAccessorHandleT
&accessorHandle);
diff --git a/src/amf/amfnd/util.cc b/src/amf/amfnd/util.cc
index bca642eac..f6dbb49c1 100644
--- a/src/amf/amfnd/util.cc
+++ b/src/amf/amfnd/util.cc
@@ -249,15 +249,16 @@ const char *avnd_failed_state_file_location(void) {
******************************************************************************/
SaAisErrorT saImmOmInitialize_cond(SaImmHandleT *immHandle,
const SaImmCallbacksT *immCallbacks,
- SaVersionT *version) {
+ const SaVersionT *version) {
if (avnd_cb->scs_absence_max_duration == 0) {
return immutil_saImmOmInitialize(immHandle, immCallbacks, version);
}
+ SaVersionT localVer = *version;
// if headless mode is enabled, don't retry as IMMA already has a 30s
// initial connection timeout towards IMMND. If we retry, we may
// cause the watchdog to kill AMFND.
- return saImmOmInitialize(immHandle, immCallbacks, version);
+ return saImmOmInitialize(immHandle, immCallbacks, &localVer);
}
/*****************************************************************************
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
