From 19a482e36065b2c26e72f6f6c448a7c834278ee3 Mon Sep 17 00:00:00 2001 From: srn Date: Mon, 20 Jun 2005 11:05:08 +0000 Subject: [PATCH] BugID IPAL9188: Moved an expression out of ASSERT macro in method createInstance --- src/Container/Container_i.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx index 59671af74..193d8be4d 100644 --- a/src/Container/Container_i.cxx +++ b/src/Container/Container_i.cxx @@ -589,7 +589,7 @@ Engines_Container_i::find_or_create_instance(string genericRegisterName, dynamic_cast (_poa->reference_to_servant(iobject)); ASSERT(servant) - int studyId = servant->getStudyId(); + int studyId = servant->getStudyId(); ASSERT (studyId >= 0); if (studyId == 0) // multiStudy instance, OK { @@ -701,7 +701,8 @@ Engines_Container_i::createInstance(string genericRegisterName, SCRUTE(aGenRegisterName); SCRUTE(_cntInstances_map[aGenRegisterName]); //SCRUTE(servant->pd_refCount); - ASSERT(servant->setStudyId(studyId)); + bool ret_studyId = servant->setStudyId(studyId); + ASSERT(ret_studyId); // --- register the engine under the name // containerName(.dir)/instanceName(.object) -- 2.39.2