Wed Jun 30 13:33:21 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
          Fixed crash when no properties are passed

        * tests/Bug_3832_Regression/run_test.pl:
          Fixed this test script

3 files changed, 42 insertions, 20 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 025f24b06b3..1d5bfe69fb0 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 30 13:33:21 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
+          Fixed crash when no properties are passed
+
+        * tests/Bug_3832_Regression/run_test.pl:
+          Fixed this test script
+
 Wed Jun 30 13:01:44 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/ami4ccm/tests/IDL_Test/Hello_Component.mpc:
diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp
index 3e08c603cce..6b9d76cc301 100644
--- a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp
+++ b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp
@@ -48,13 +48,12 @@ namespace DAnCE
   {
     DANCE_TRACE ("LocalityManager_i::init");
 
-    DANCE_DEBUG (6, (LM_DEBUG, DLINFO
+    if (props)
+      {
+        DANCE_DEBUG (6, (LM_DEBUG, DLINFO
                      ACE_TEXT ("LocalityManager_i::init - ")
                      ACE_TEXT ("Received %u properties from init\n"),
                      props->length ()));
-
-    if (props)
-      {
         this->props_ = props;
 
         DAnCE::Utility::update_property_value (ENTITY_POA,
@@ -65,8 +64,9 @@ namespace DAnCE
       }
 
     std::string type =
-      PLUGIN_MANAGER::instance ()->register_installation_handler (ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
-                                                                  ACE_TEXT_CHAR_TO_TCHAR ("create_Container_Handler"));
+      PLUGIN_MANAGER::instance ()->register_installation_handler (
+        ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
+        ACE_TEXT_CHAR_TO_TCHAR ("create_Container_Handler"));
 
     if (type.c_str ())
       {
@@ -80,8 +80,10 @@ namespace DAnCE
                      type.c_str ()));
 
     type =
-      PLUGIN_MANAGER::instance ()->register_installation_handler (ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
-                                                                  ACE_TEXT_CHAR_TO_TCHAR ("create_Home_Handler"));
+      PLUGIN_MANAGER::instance ()->register_installation_handler (
+        ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
+        ACE_TEXT_CHAR_TO_TCHAR ("create_Home_Handler"));
+        
     if (type.c_str ())
       {
         this->handler_order_.push_back (type.c_str ());
@@ -94,8 +96,9 @@ namespace DAnCE
                      type.c_str ()));
 
     type =
-      PLUGIN_MANAGER::instance ()->register_installation_handler (ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
-                                                                  ACE_TEXT_CHAR_TO_TCHAR ("create_Homed_Component_Handler"));
+      PLUGIN_MANAGER::instance ()->register_installation_handler (
+        ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
+        ACE_TEXT_CHAR_TO_TCHAR ("create_Homed_Component_Handler"));
     if (type.c_str ())
       {
         this->handler_order_.push_back (type.c_str ());
@@ -108,8 +111,9 @@ namespace DAnCE
                      type.c_str ()));
 
     type =
-      PLUGIN_MANAGER::instance ()->register_installation_handler (ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
-                                                                  ACE_TEXT_CHAR_TO_TCHAR ("create_Component_Handler"));
+      PLUGIN_MANAGER::instance ()->register_installation_handler (
+        ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Handlers"),
+        ACE_TEXT_CHAR_TO_TCHAR ("create_Component_Handler"));
     if (type.c_str ())
       {
         this->handler_order_.push_back (type.c_str ());
@@ -121,8 +125,9 @@ namespace DAnCE
                      ACE_TEXT ("Registered handler for <%C>\n"),
                      type.c_str ()));
 
-    PLUGIN_MANAGER::instance ()->register_interceptor (ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Interceptors"),
-                                                       ACE_TEXT_CHAR_TO_TCHAR ("create_CIAO_StoreReferences"));
+    PLUGIN_MANAGER::instance ()->register_interceptor (
+      ACE_TEXT_CHAR_TO_TCHAR ("CIAO_Deployment_Interceptors"),
+      ACE_TEXT_CHAR_TO_TCHAR ("create_CIAO_StoreReferences"));
 
     bool tmp;
     if (props &&
@@ -130,12 +135,16 @@ namespace DAnCE
                                             *props,
                                             tmp))
       {
-        PLUGIN_MANAGER::instance ()->register_interceptor (ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Error_Interceptors"),
-                                                          ACE_TEXT_CHAR_TO_TCHAR ("create_DAnCE_Best_Effort"));
+        PLUGIN_MANAGER::instance ()->register_interceptor (
+          ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Error_Interceptors"),
+          ACE_TEXT_CHAR_TO_TCHAR ("create_DAnCE_Best_Effort"));
       }
     else
-      PLUGIN_MANAGER::instance ()->register_interceptor (ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Error_Interceptors"),
-                                                          ACE_TEXT_CHAR_TO_TCHAR ("create_DAnCE_Standard_Error"));
+      {
+        PLUGIN_MANAGER::instance ()->register_interceptor (
+          ACE_TEXT_CHAR_TO_TCHAR ("DAnCE_Error_Interceptors"),
+          ACE_TEXT_CHAR_TO_TCHAR ("create_DAnCE_Standard_Error"));
+      }
 
     if (this->props_)
       {
diff --git a/CIAO/tests/Bug_3832_Regression/run_test.pl b/CIAO/tests/Bug_3832_Regression/run_test.pl
index 11f4195c012..85c75ae1293 100755
--- a/CIAO/tests/Bug_3832_Regression/run_test.pl
+++ b/CIAO/tests/Bug_3832_Regression/run_test.pl
@@ -26,9 +26,14 @@ $ENV {'CIAO_LOG_FILE'} = 'test.log';
 
 my $node_app = $server->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
 
-$SV = $server->CreateProcess ("$node_app");
+$SV = $server->CreateProcess ("$node_app", "-u c7a07968-7ece-11df-8000-67c6697351ff");
 
-$SV->Spawn ();
+$server_status = $SV->Spawn ();
+
+if ($server_status != 0) {
+    print STDERR "ERROR: dance_locality_manager returned $server_status\n";
+    exit 1;
+}
 
 if ($server->WaitForFileTimed ($TestCaseC_i,
                                $server->ProcessStartWaitInterval()) == -1) {