From 7a732fc9d1f7886a7f29ef93da5542f4215eb066 Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 17 Feb 2014 17:10:11 +0400 Subject: [PATCH] do not catch CORBA exceptions thrown by SMESH_Mesh_i --- src/SMESH_I/SMESH_Mesh_i.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index c539c3061..bc56a0b0a 100644 --- a/src/SMESH_I/SMESH_Mesh_i.cxx +++ b/src/SMESH_I/SMESH_Mesh_i.cxx @@ -81,8 +81,6 @@ #include #include -#include "SMESH_TryCatch.hxx" // include after OCCT headers! - // STL Includes #include #include @@ -91,6 +89,11 @@ #include +// to pass CORBA exception through SMESH_TRY +#define SMY_OWN_CATCH catch( SALOME::SALOME_Exception& se ) { throw se; } + +#include "SMESH_TryCatch.hxx" // include after OCCT headers! + #ifdef _DEBUG_ static int MYDEBUG = 0; #else @@ -1504,7 +1507,7 @@ SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups, if ( aType == SMESH::ALL ) aType = aGrp->GetType(); else if ( aType != aGrp->GetType() ) - THROW_SALOME_CORBA_EXCEPTION("UnionListOfGroups(): different group types", + THROW_SALOME_CORBA_EXCEPTION("CreateDimGroup(): different group types", SALOME::BAD_PARAM); if ( SMESH_GroupBase_i* grp_i = SMESH::DownCast< SMESH_GroupBase_i* >( aGrp )) if ( SMESHDS_GroupBase* grpDS = grp_i->GetGroupDS() ) @@ -1522,7 +1525,7 @@ SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups, if ( CORBA::is_nil( aGrp ) ) continue; if ( aType != aGrp->GetType() ) - THROW_SALOME_CORBA_EXCEPTION("UnionListOfGroups(): different group types", + THROW_SALOME_CORBA_EXCEPTION("CreateDimGroup(): different group types", SALOME::BAD_PARAM); if ( SMESH_GroupBase_i* grp_i = SMESH::DownCast< SMESH_GroupBase_i* >( aGrp )) if ( SMESHDS_GroupBase* grpDS = grp_i->GetGroupDS() ) -- 2.39.2