Merge branch 'V9_8_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1fd9d819c3d380de209c4de8a3285802b4e08b8..5cd5827c133cbf0534f2ee8be872e1eca777bf9b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,7 @@ ENDIF()
 
 # Versioning
 # ===========
-SALOME_SETUP_VERSION(9.8.0)
+SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
 MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
 
 # Find KERNEL

diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
index 3e8d270f2d3fce54095faf39b6dae55f0d1fb4d8..8a41e29c10ae34b20092c31176e8e233073da840 100644 (file)
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
@@ -626,16 +626,20 @@ CORBA::Boolean GEOM_IBlocksOperations_i::CheckCompoundOfBlocks
   Handle(::GEOM_Object) aCompound = GetObjectImpl(theCompound);
   if (aCompound.IsNull()) return isComp;
 
+  GEOM::GEOM_IBlocksOperations::BCErrors_var anErrArray =
+    new GEOM::GEOM_IBlocksOperations::BCErrors();
+
   //Check
   std::list<GEOMImpl_IBlocksOperations::BCError> errList;
   isComp = GetOperations()->CheckCompoundOfBlocks
     (aCompound, theToleranceC1, errList);
-  if (!GetOperations()->IsDone())
+  if (!GetOperations()->IsDone()) {
+    anErrArray->length(0);
+    theErrors = anErrArray._retn();
     return isComp;
+  }
 
   const int nbErr = errList.size();
-  GEOM::GEOM_IBlocksOperations::BCErrors_var anErrArray =
-    new GEOM::GEOM_IBlocksOperations::BCErrors();
   anErrArray->length(nbErr);
 
   // fill the local CORBA array with values from lists