osaf/services/saf/immsv/immloadd/imm_loader.cc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
he 2PBE patch stack introduced two problems in immloader.
The first problem was that default loading without PBE enabled no longer
was working. Initialization of an STL string parameter in main() for
immloader was not done correctly. THis caused immloader to crash whenever
started with pbe not enabled.
The second problem was that the introduced creation of an IMM runtime
class dedicated for supporting IMM PBE, done by immloader, did not
screen for the preloader clase when preloading was done from xml-file.
The immloader tried to create this new special runtime class already
in preloading, which of course failed.
Both of these problems are fixed in this patch.
diff --git a/osaf/services/saf/immsv/immloadd/imm_loader.cc
b/osaf/services/saf/immsv/immloadd/imm_loader.cc
--- a/osaf/services/saf/immsv/immloadd/imm_loader.cc
+++ b/osaf/services/saf/immsv/immloadd/imm_loader.cc
@@ -1099,7 +1099,7 @@ static void endElementHandler(void* user
"imm.xml load file", OPENSAF_IMM_CLASS_NAME);
}
- if(!opensafPbeRtClassCreated) {
+ if(!opensafPbeRtClassCreated && !(state->preloadEpochPtr)) {
if(opensafPbeRtClassCreate(state->immHandle)) {
LOG_NO("The class %s has been created since it was missing
from the "
"imm.xml load file", OPENSAF_IMM_PBE_RT_CLASS_NAME);
@@ -2470,7 +2470,8 @@ int main(int argc, char* argv[])
void* pbeHandle=NULL;
const char* pbe_file = getenv("IMMSV_PBE_FILE");
const char* pbe_file_suffix = getenv("IMMSV_PBE_FILE_SUFFIX");
- std::string pbeFile(pbe_file);
+ std::string pbeFile;
+ if(pbe_file) {pbeFile.append(pbe_file);}
if(pbe_file_suffix) {
pbeFile.append(pbe_file_suffix);
}
------------------------------------------------------------------------------
November Webinars for C, C++, Fortran Developers
Accelerate application performance with scalable programming models. Explore
techniques for threading, error checking, porting, and tuning. Get the most
from the latest Intel processors and coprocessors. See abstracts and register
http://pubads.g.doubleclick.net/gampad/clk?id=60136231&iu=/4140/ostg.clktrk
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
