Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a8c011
)
message 'unknown exception' while several mesh in parallel is not relevant
author
Paul RASCLE
<paul.rascle@edf.fr>
Mon, 19 Feb 2018 15:25:13 +0000
(16:25 +0100)
committer
Paul RASCLE
<paul.rascle@edf.fr>
Mon, 19 Feb 2018 15:28:43 +0000
(16:28 +0100)
src/SMESH_I/SMESH_Gen_i.cxx
patch
|
blob
|
history
diff --git
a/src/SMESH_I/SMESH_Gen_i.cxx
b/src/SMESH_I/SMESH_Gen_i.cxx
index b29e9a90173dd725ca4534098dad708a9ba8f289..834b5ce768f025e46608ebeb5e65c7e35c83e8ca 100644
(file)
--- a/
src/SMESH_I/SMESH_Gen_i.cxx
+++ b/
src/SMESH_I/SMESH_Gen_i.cxx
@@
-178,7
+178,23
@@
PortableServer::ServantBase_var SMESH_Gen_i::GetServant( CORBA::Object_ptr theOb
PortableServer::Servant aServant = GetPOA()->reference_to_servant( theObject );
return aServant;
}
PortableServer::Servant aServant = GetPOA()->reference_to_servant( theObject );
return aServant;
}
- catch (...) {
+ catch (PortableServer::POA::ObjectNotActive &ex)
+ {
+ INFOS("GetServant: ObjectNotActive");
+ return NULL;
+ }
+ catch (PortableServer::POA::WrongAdapter &ex)
+ {
+ INFOS("GetServant: WrongAdapter: OK when several servants used to build several mesh in parallel...");
+ return NULL;
+ }
+ catch (PortableServer::POA::WrongPolicy &ex)
+ {
+ INFOS("GetServant: WrongPolicy");
+ return NULL;
+ }
+ catch (...)
+ {
INFOS( "GetServant - Unknown exception was caught!!!" );
return NULL;
}
INFOS( "GetServant - Unknown exception was caught!!!" );
return NULL;
}
@@
-629,9
+645,11
@@
void SMESH_Gen_i::setCurrentStudy( SALOMEDS::Study_ptr theStudy,
bool theStudyIsBeingClosed)
{
int curStudyId = GetCurrentStudyID();
bool theStudyIsBeingClosed)
{
int curStudyId = GetCurrentStudyID();
+ MESSAGE("curStudyId " << curStudyId);
myCurrentStudy = SALOMEDS::Study::_duplicate( theStudy );
// create study context, if it doesn't exist and set current study
int studyId = GetCurrentStudyID();
myCurrentStudy = SALOMEDS::Study::_duplicate( theStudy );
// create study context, if it doesn't exist and set current study
int studyId = GetCurrentStudyID();
+ MESSAGE("studyId " << studyId);
if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() )
myStudyContextMap[ studyId ] = new StudyContext;
if ( myStudyContextMap.find( studyId ) == myStudyContextMap.end() )
myStudyContextMap[ studyId ] = new StudyContext;
@@
-645,6
+663,7
@@
void SMESH_Gen_i::setCurrentStudy( SALOMEDS::Study_ptr theStudy,
// Let meshes update their data depending on GEOM groups that could change
if ( curStudyId != studyId )
{
// Let meshes update their data depending on GEOM groups that could change
if ( curStudyId != studyId )
{
+ MESSAGE("curStudyId " << curStudyId << " studyId " << studyId);
CORBA::String_var compDataType = ComponentDataType();
SALOMEDS::SComponent_wrap me = myCurrentStudy->FindComponent( compDataType.in() );
if ( !me->_is_nil() ) {
CORBA::String_var compDataType = ComponentDataType();
SALOMEDS::SComponent_wrap me = myCurrentStudy->FindComponent( compDataType.in() );
if ( !me->_is_nil() ) {