Crash in the destructor with omniORB4

[modules/superv.git] / src / Supervision / SNode_Impl.cxx

diff --git a/src/Supervision/SNode_Impl.cxx b/src/Supervision/SNode_Impl.cxx
index 1d6b83e6faf1ef7763cd2956134590e600efb59f..552ecb1d14ca5b4286b205be7b65d0fee6f11347 100644 (file)
--- a/src/Supervision/SNode_Impl.cxx
+++ b/src/Supervision/SNode_Impl.cxx
@@ -79,27 +79,35 @@ void SNode_Impl::destroy() {
     SUPERV::GNode_ptr aCoupled = SUPERV::GNode::_narrow( Coupled() ) ;
     if ( Delete() ) {
       _poa->deactivate_object(*_id) ;
-      CORBA::release(_poa) ;
+//      CORBA::release(_poa) ;
       delete(_id) ;
-      _thisObj->_remove_ref();
+//      _thisObj->_remove_ref();
+    }
+    else {
+      MESSAGE("SNode_Impl::destroy ERROR ") ;
     }
     if ( !CORBA::is_nil( aCoupled ) ) {
-      aCoupled->SetCoupled( "" ) ;
+//      aCoupled->SetCoupled( "" ) ; : Used in GraphBase::Graph::RemoveNode( EndSwitchNode ) :
       aCoupled->destroy() ;
     }
+// Valid() only after deletion of the corresponding EndSwitchNode :
+    DataFlowEditor()->UnValid() ;
   }
-//  endService( "SNode_Impl::Destroy" );
+  endService( "SNode_Impl::Destroy" );
 }
 
 bool SNode_Impl::Delete() {
-//  beginService( "SNode_Impl::Delete" );
+  beginService( "SNode_Impl::Delete" );
   bool RetVal = false ;
   if ( DataFlowEditor()->IsEditing() ) {
+    DeletePorts() ;
     RetVal = DataFlowEditor()->RemoveNode( Name() ) ;
-    if ( RetVal )
-      RetVal = DataFlowEditor()->IsValid() ;
+// Valid() only after deletion of the corresponding EndLoopNode :
+//    if ( RetVal ) {
+//      RetVal = DataFlowEditor()->IsValid() ;
+//    }
   }
-//  endService( "SNode_Impl::Delete" );
+  endService( "SNode_Impl::Delete" );
   return RetVal ;
 }