ChangeLogTag: Sat Dec 13 06:36:48 UTC 2008 Friedhelm Wolf <fwolf@dre.vanderbilt.edu>

4 files changed, 41 insertions, 13 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e8bdc4857e6..20bbb33d187 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,17 @@
+Sat Dec 13 06:36:48 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp:
+        
+          Removed debug statements.
+        
+        * DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp:
+        
+          Added check for empty self-reference in component.
+        
+        * ciao/FTComponentServer/CIAO_FTComponentServer.cpp:
+        
+          Added AppSideReg for AppSideMonitor_Thread startup.
+
 Sat Dec 13 02:33:20 UTC 2008  Friedhelm Wolf  <fwolf@dre.vanderbilt.edu>
 
        * DAnCE/tests/CIAO/FTClientComponent/Worker.idl
diff --git a/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp b/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp
index 66e7180ce0b..ccce31f683d 100644
--- a/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FTTask/FTTask_exec.cpp
@@ -40,7 +40,7 @@ namespace CIDL_FTTask_Impl
       context_ (DeCoRAM::CCM_FTTask_Context::_nil ()),
       myself_ (CORBA::Object::_nil ()),
       object_id_ ("Fault Tolerant Task"),
-      load_ (0.3),
+      load_ (30),
       primary_ (true),
       state_ (0)
   {
@@ -151,7 +151,7 @@ namespace CIDL_FTTask_Impl
   FTTask_exec_i::COMPONENT_REFERENCE (::CORBA::Object_ptr COMPONENT_REFERENCE)
   {
     CIAO_TRACE ("FTTask_exec_i::COMPONENT_REFERENCE () setter");
-    myself_ = COMPONENT_REFERENCE;
+    myself_ = CORBA::Object::_duplicate (COMPONENT_REFERENCE);
   }
 
   CORBA::Double
@@ -256,8 +256,14 @@ namespace CIDL_FTTask_Impl
 	    return;
 	  }
 	
-	CIAO_DEBUG ((LM_DEBUG, "registering the application with the agent.\n"));
-	    
+	CIAO_DEBUG ((LM_DEBUG, "FTTask_exec_i::configuration_complete - registering the application with the agent.\n"));
+
+        if (CORBA::is_nil (myself_.in ()))
+          {
+            CIAO_ERROR ((LM_ERROR, "FTTask_exec_i::configuration_complete - Could not resolve my own reference!\n"));
+            return;
+          }
+
 	ReplicatedApplication_var myself = ReplicatedApplication::_narrow (myself_.in ());
 
 	if (CORBA::is_nil (myself.in ()))
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp
index 4ec1f755b43..295d6ccfa4d 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp
@@ -24,27 +24,18 @@ int usage ()
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  std::cerr << "1\n";
-  
   CIAO_DISABLE_TRACE ();
   
-  std::cerr << "1\n";
-
   auto_ptr<CIAO::Logger_Service> logger;
   
-  std::cerr << "1\n";
-
   CIAO::Logger_Service
     * dlf = ACE_Dynamic_Service<CIAO::Logger_Service>::instance ("CIAO_Logger_Backend_Factory");  
   
-  std::cerr << "1\n";
-
   if (!dlf)
     dlf = new CIAO::Logger_Service;
   
   logger.reset (dlf);
   logger->init (argc, argv);
-  std::cerr << "2\n";
   
   CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
   
diff --git a/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer.cpp b/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer.cpp
index 896b28672eb..94c4f274702 100644
--- a/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer.cpp
+++ b/CIAO/ciao/FTComponentServer/CIAO_FTComponentServer.cpp
@@ -34,6 +34,7 @@
 #include "orbsvcs/orbsvcs/LWFT/LWFT_Server_Init.h"
 #include "orbsvcs/orbsvcs/LWFT/LWFT_Client_Init.h"
 #include "orbsvcs/orbsvcs/LWFT/AppOptions.h"
+#include "orbsvcs/orbsvcs/LWFT/AppSideReg.h"
 #include "orbsvcs/orbsvcs/LWFT/ReplicationManagerC.h"
 
 #ifdef CIAO_BUILD_COMPONENTSERVER_EXE
@@ -118,6 +119,7 @@ namespace CIAO
         }
 
       AppOptions::instance ()->parse_args (argc, argv);
+      AppOptions::instance ()->process_id (this->get_process_id ());
       
       this->configurator_->pre_orb_initialize ();
 
@@ -160,6 +162,21 @@ namespace CIAO
 	  poa_manager->activate ();
 
 	  CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - "
+		       "starting AppSideMonitor thread.\n"));
+
+          AppSideReg proc_reg (orb_.in ());
+          
+          int result = proc_reg.activate ();
+      
+          if (result != 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 "AppSideReg::activate () returned %d\n",
+                                 result),
+                                -1);
+            }
+
+	  CIAO_DEBUG ((LM_TRACE, CLINFO "ComponentServer_Task::svc - "
 		       "Creating state synchronization servant\n"));
 
 	  // start up SSA