PAL10358: GetStudyByName() doesn't work if a study has not already been created

diff --git a/src/NamingService/SALOME_NamingService.cxx b/src/NamingService/SALOME_NamingService.cxx
index 4beb6d4e3606c5d5463cdfee7f501900dc6ee2c3..3f1f09374dc38fb5f2d19cf54817eba35ede8aab 100644 (file)
--- a/src/NamingService/SALOME_NamingService.cxx
+++ b/src/NamingService/SALOME_NamingService.cxx
@@ -677,7 +677,8 @@ void SALOME_NamingService::list()
   unsigned long nb=0 ; // for using only the BindingIterator to access the bindings
   CosNaming::Binding_var _binding ;
   CosNaming::NamingContext_var _ref_context = _current_context;
-  _current_context->list(nb, _binding_list, _binding_iterator) ;
+  _current_context->list(nb, _binding_list, _binding_iterator);
+  if (_binding_iterator->_is_nil()) return;
 
   while (_binding_iterator->next_one(_binding)) {
     CosNaming::Name _bindingName = _binding->binding_name;
@@ -1202,7 +1203,8 @@ void SALOME_NamingService::_Find(const char* name,
   CosNaming::NamingContext_var _ref_context = _current_context;
   CosNaming::NamingContext_var _found_context = _current_context;
 
-  _current_context->list(nb, _binding_list, _binding_iterator) ;
+  _current_context->list(nb, _binding_list, _binding_iterator);
+  if (_binding_iterator->_is_nil()) return;
 
   while (_binding_iterator->next_one(_binding)) {
     CosNaming::Name _bindingName = _binding->binding_name;
@@ -1283,7 +1285,8 @@ SALOME_NamingService::_current_directory(char** result_path,
   CosNaming::NamingContext_var _ref_context = _current_context;
   CosNaming::NamingContext_var _temp_context = _current_context;
  
-  _current_context->list(nb, _binding_list, _binding_iterator) ;
+  _current_context->list(nb, _binding_list, _binding_iterator);
+  if (_binding_iterator->_is_nil()) return;
 
   while ((_binding_iterator->next_one(_binding)) && _continue) {
     CosNaming::Name _bindingName = _binding->binding_name;
@@ -1357,7 +1360,9 @@ void SALOME_NamingService::_list_directory_recurs(vector<string>& myList, const
     }
   else
     absDir=(char *)absCurDirectory;
-  _current_context->list(nb, _binding_list, _binding_iterator) ;
+
+  _current_context->list(nb, _binding_list, _binding_iterator);
+  if (_binding_iterator->_is_nil()) return;
 
   while (_binding_iterator->next_one(_binding)) {
     CosNaming::Name _bindingName = _binding->binding_name;