From 4c7ea1f62d12143e1636e7e4d5819a841c794971 Mon Sep 17 00:00:00 2001 From: sma Date: Wed, 16 Feb 2011 11:15:50 +0000 Subject: ChangeLogTag: Tue Feb 16 11:15:00 UTC 2011 Simon Massey --- TAO/ChangeLog | 7 +++++++ TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp | 2 +- TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 31aca949a42..7a9ea992d10 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Feb 16 11:15:00 UTC 2011 Simon Massey + + * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp: + Initalise instance of enum ActivationMode when first + created, otherwise rubbish value gets marshaled. + Tue Feb 15 13:53:16 UTC 2011 Vladimir Zykov * tao/PortableServer/Active_Object_Map.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp index 1aad53134c1..b8204ebca0e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp @@ -1108,7 +1108,7 @@ ImR_Locator_i::find (const char* server, else { ACE_NEW_THROW_EX (imr_info, ImplementationRepository::ServerInformation, CORBA::NO_MEMORY ()); - + imr_info->startup.activation= ImplementationRepository::NORMAL; if (debug_ > 1) ACE_DEBUG ((LM_DEBUG, "ImR: Cannot find server <%C>\n", server)); } diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 7937126a7d2..3c80579dd5f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -1018,6 +1018,7 @@ TAO_IMR_Op_Register::run (void) ACE_DEBUG((LM_DEBUG, "Adding Server <%C> on update command.\n", this->server_name_.c_str ())); is_add_ = true; } + local.activation= ImplementationRepository::NORMAL; options = &local; } -- cgit v1.2.1