1 files changed, 34 insertions, 34 deletions

diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
index be8dd5e0e1f..9811c2be488 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -4,24 +4,23 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Task.h"
 
-class ImR_Locator_ORB_Runner : public ACE_Task_Base
+class ImR_Locator_ORB_Runner : public ACE_Task_Base 
 {
+  ImR_Locator_Loader& service_;
 public:
-  ImR_Locator_ORB_Runner (ImR_Locator_Loader& service)
-    : service_ (service)
+  ImR_Locator_ORB_Runner(ImR_Locator_Loader& service)
+    : service_(service)
   {
   }
-  virtual int svc ()
+  virtual int svc() 
   {
-    // Block until service_.fini () calls orb->destroy ()
-    this->service_.run ();
+    // Block until service_.fini() calls orb->destroy()
+    this->service_.run();
     return 0;
   }
-private:
-  ImR_Locator_Loader& service_;
 };
 
-ImR_Locator_Loader::ImR_Locator_Loader()
+ImR_Locator_Loader::ImR_Locator_Loader() 
 {
 }
 
@@ -31,19 +30,19 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int err = this->opts_.init (argc, argv);
-      if (err != 0)
+      int err = this->opts_.init(argc, argv);
+      if (err != 0) 
         return -1;
 
-      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_Locator_ORB_Runner (*this));
-      this->runner_->activate ();
+      ACE_ASSERT(this->runner_.get() == 0);
+      this->runner_.reset(new ImR_Locator_ORB_Runner(*this));
+      this->runner_->activate();
     }
   ACE_CATCHANY
     {
@@ -56,20 +55,20 @@ ImR_Locator_Loader::init (int argc, ACE_TCHAR *argv[])
 int
 ImR_Locator_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
-    {
-    }
+  {
+  }
   ACE_ENDTRY;
   return -1;
 }
@@ -81,7 +80,7 @@ ImR_Locator_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
@@ -89,16 +88,17 @@ ImR_Locator_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;
 }