CCAR: minor bugs

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index 9877b1bda2b578798f2158111a531387b0c74fd7..a18a09c8e45c471ee0222fa2e7ebe7e05e276e84 100644 (file)
--- 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 c9f1e44bcec6f56069506b015370647b8adc8953..2cd14763498cb9d5a2cd726ca109b02b332e7e87 100644 (file)
--- 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 0eed8ce4f05891a8ece8e9a6ed996555c44c4769..d6e144b1f50e350b55e6d7f3482dc26789f67f79 100644 (file)
--- 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++;
        }