From f0a6734112863dda8ff3ffa22277eeea14ae05f9 Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Thu, 8 Nov 2007 18:31:30 +0000
Subject: [PATCH] CCAR: minor bugs

---
 src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx    | 7 ++-----
 src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx      | 6 ------
 src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx | 5 +----
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index 9877b1bda..a18a09c8e 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -503,11 +503,8 @@ _LoadComponent(const Engines::MachineParameters& params,
 	      int studyId,
 	      const Engines::MachineList& listOfMachines)
 {
-  const char *containerName = params.container_name;
-  int nbproc = NbProc(params);
-
-  MESSAGE("_LoadComponent, required " << containerName <<
-	  " " << componentName << " " << nbproc);
+  MESSAGE("_LoadComponent, required " << params.container_name <<
+	  " " << componentName << " " << NbProc(params));
 
   Engines::Container_var cont =
     _ContManager->FindOrStartContainer(params,
diff --git a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
index c9f1e44bc..2cd147634 100644
--- a/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/Test_LifeCycleCORBA.cxx
@@ -140,12 +140,6 @@ int main (int argc, char * argv[])
     {
       INFOS("Caught system exception COMM_FAILURE -- unable to contact the object.");
     }
-#ifndef WNT
-  catch(CORBA::SystemException&)
-    {
-      INFOS("Caught a CORBA::SystemException.");
-    }
-#endif
   catch(CORBA::Exception&)
     {
       INFOS("Caught CORBA::Exception.");
diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
index 0eed8ce4f..d6e144b1f 100644
--- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
+++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.cxx
@@ -515,10 +515,7 @@ SALOME_ModuleCatalogImpl::GetTypedComponentList(SALOME_ModuleCatalog::ComponentT
       if  (_personal_module_list[ind].type == _temp_component_type)
 	{
 	  _list_typed_component->length(_j + 1); 
-	  /* Is it an error ?
-           * _list_typed_component[_j] = _personal_module_list[ind].name.c_str();
-           */
-	  _list_typed_component[_j] = (_moduleList[ind].name).c_str();
+           _list_typed_component[_j] = _personal_module_list[ind].name.c_str();
 	  //if(MYDEBUG) SCRUTE(_list_typed_component[_j]);
 	  _j++;
 	}
-- 
2.39.2