From: prascle <prascle>
Date: Tue, 8 Jan 2013 16:03:15 +0000 (+0000)
Subject: Merge from 1.18.2.11.10.10
X-Git-Tag: V7_1_0b1~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=455ff4a2faae87e3e395f79a8c9fdf806354d4af;p=modules%2Fkernel.git

Merge from 1.18.2.11.10.10
---

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index afd7e6f63..6d138af19 100644
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -100,11 +100,13 @@ SALOME_LifeCycleCORBA::SALOME_LifeCycleCORBA(SALOME_NamingService *ns)
 
   CORBA::Object_var obj =
     _NS->Resolve(SALOME_ContainerManager::_ContainerManagerNameInNS);
-  ASSERT( !CORBA::is_nil(obj));
+  if (CORBA::is_nil(obj))
+    throw SALOME_Exception("Error: Cannot resolve ContainerManager in Naming Service");
   _ContManager=Engines::ContainerManager::_narrow(obj);
 
   obj = _NS->Resolve(SALOME_ResourcesManager::_ResourcesManagerNameInNS);
-  ASSERT( !CORBA::is_nil(obj));
+  if (CORBA::is_nil(obj))
+    throw SALOME_Exception("Error: Cannot resolve ResourceManager in Naming Service");
   _ResManager=Engines::ResourcesManager::_narrow(obj);
 }