1 files changed, 37 insertions, 34 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
index 9f222a54739..4429f6eba49 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.cpp
@@ -4,27 +4,27 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Task.h"
 
-class ImR_Activator_ORB_Runner : public ACE_Task_Base
+class ImR_Activator_ORB_Runner : public ACE_Task_Base 
 {
   ImR_Activator_Loader& service_;
 public:
-  ImR_Activator_ORB_Runner (ImR_Activator_Loader& service)
-    : service_ (service)
+  ImR_Activator_ORB_Runner(ImR_Activator_Loader& service)
+    : service_(service)
   {
   }
-  virtual int svc ()
+  virtual int svc() 
   {
     // Block until service_.fini() calls orb->destroy()
-    this->service_.run ();
+    this->service_.run();
     return 0;
   }
 };
 
-ImR_Activator_Loader::ImR_Activator_Loader (void)
+ImR_Activator_Loader::ImR_Activator_Loader(void) 
 {
 }
 
-// For now, we will assume that it's sufficient to start
+// For now, we will assume that it's sufficient to start 
 // the service in its own thread. Later, if necessary, we
 // can add a command line option to allow the imr to use
 // the same orb as other tao services, however the imr
@@ -35,20 +35,20 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
-      int err = this->opts_.init (argc, argv);
-      if (err != 0)
+      int err = this->opts_.init(argc, argv);
+      if (err != 0) 
         return -1;
 
       // Creates it's own internal orb, which we must run later
-      err = this->service_.init (this->opts_ ACE_ENV_ARG_PARAMETER);
+      err = this->service_.init(this->opts_ ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (err != 0)
         return -1;
 
       // Create a thread in which to run the service
-      ACE_ASSERT (this->runner_.get () == 0);
-      this->runner_.reset (new ImR_Activator_ORB_Runner (*this));
-      this->runner_->activate ();
+      ACE_ASSERT(this->runner_.get() == 0);
+      this->runner_.reset(new ImR_Activator_ORB_Runner(*this));
+      this->runner_->activate();
     }
   ACE_CATCHANY
     {
@@ -61,22 +61,23 @@ ImR_Activator_Loader::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 int
 ImR_Activator_Loader::fini (void)
 {
-  ACE_ASSERT (this->runner_.get() != 0);
+  ACE_ASSERT(this->runner_.get() != 0);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      int ret = this->service_.fini (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+  {
+    int ret = this->service_.fini(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      this->runner_->wait ();
-      this->runner_.reset (0);
-      return ret;
-    }
+    this->runner_->wait();
+    this->runner_.reset(0);
+    return ret;
+  }
   ACE_CATCHANY
-    {
-      return -1;
-    }
+  {
+    return -1;
+  }
   ACE_ENDTRY;
+  return -1;
 }
 
 CORBA::Object_ptr
@@ -86,24 +87,26 @@ ImR_Activator_Loader::create_object (CORBA::ORB_ptr,
                                   ACE_ENV_ARG_DECL)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN(CORBA::NO_IMPLEMENT (), CORBA::Object::_nil ());
+  ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), CORBA::Object::_nil());
 }
 
 int
-ImR_Activator_Loader::run (void)
+ImR_Activator_Loader::run(void)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      return this->service_.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
+  {
+    return this->service_.run(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
   ACE_CATCHALL
-    {
-      ACE_ERROR ((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
-      return -1;
-    }
+  {
+    ACE_ERROR((LM_ERROR, "Exception in ImR_Locator_ORB_Runner()\n"));
+    return -1;
+  }
   ACE_ENDTRY;
+  return 0;
 }
 
 ACE_FACTORY_DEFINE (Activator, ImR_Activator_Loader)
+