SMH: 3.0.0 preparation = merged version (POLYWORK + RTVDEBUG01) + adopation for new GUI

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

diff --git a/src/Supervision/INode_Impl.cxx b/src/Supervision/INode_Impl.cxx
index 8797369d8543026f44cedbc2ac2f18e3a38ff4f4..fe5d9ef926a5984e86ee25e76a342e6236c0bf7d 100644 (file)
--- a/src/Supervision/INode_Impl.cxx
+++ b/src/Supervision/INode_Impl.cxx
@@ -151,7 +151,7 @@ bool INode_Impl::Delete() {
     DeletePorts() ;
     RetVal = DataFlowEditor()->RemoveNode( Name() ) ;
     if ( RetVal )
-      RetVal = DataFlowEditor()->UnValid() ;
+      DataFlowEditor()->UnValid() ;
   }
 //  endService( "INode_Impl::Delete" );
   return RetVal ;
@@ -243,14 +243,15 @@ SUPERV::Port_ptr INode_Impl::OutPort( const char *aParameterName ,
   if ( anOutPort ) {
     Outobject = anOutPort->ObjRef() ;
     if ( CORBA::is_nil( Outobject ) ) {
-      const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005      const CORBA::Any * anAny = anOutPort->Value() ;
+      const CORBA::Any anAny = anOutPort->Value() ;
       myOutPort = new Port_Impl( _Orb , _Poa , _ContId ,
                                  instanceName() , interfaceName() ,
                                  DataFlowEditor() ,
                                  DataFlowNode() ,
                                  (GraphBase::Port * ) anOutPort ,
                                  false ,
-                                 anAny ) ;
+                                 &anAny ) ;
       if ( myOutPort ) {
         PortableServer::ObjectId * id = myOutPort->getId() ;
         CORBA::Object_var obj = _poa->id_to_reference(*id) ;
@@ -336,14 +337,15 @@ SUPERV::StreamPort_ptr INode_Impl::OutStreamPort( const char * aParameterName ,
       if ( anOutPort ) {
         Outobject = SUPERV::StreamPort::_narrow( anOutPort->ObjRef() ) ;
         if ( CORBA::is_nil( Outobject ) ) {
-          const CORBA::Any * anAny = anOutPort->Value() ;
+//JR 30.03.2005          const CORBA::Any * anAny = anOutPort->Value() ;
+          const CORBA::Any anAny = anOutPort->Value() ;
           myOutStreamPort = new StreamPort_Impl( _Orb , _Poa , _ContId ,
                                  instanceName() , interfaceName() ,
                                  DataFlowEditor() ,
                                  DataFlowNode() ,
                                  (GraphBase::Port * ) anOutPort ,
                                  false ,
-                                 anAny ) ;
+                                 &anAny ) ;
           if ( myOutStreamPort ) {
             PortableServer::ObjectId * id = myOutStreamPort->getId() ;
             CORBA::Object_var obj = _poa->id_to_reference(*id) ;