Memory Leaks + management of instances of services

diff --git a/src/GraphEditor/DataFlowEditor_OutNode.cxx b/src/GraphEditor/DataFlowEditor_OutNode.cxx
index 440e3546da14abbe1a9b9ec5e23df3898f4b1ba0..95bd6c040df4b4b55e16e97a7060f0931fa6b6d1 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_OutNode.cxx
+++ b/src/GraphEditor/DataFlowEditor_OutNode.cxx
@@ -688,7 +688,9 @@ GraphEditor::InNode * GraphEditor::OutNode::AddNode(
         if ( aNodeName ) {
           delete [] aNodeName ;
        }
-        int num = Graph()->GetServiceNameNumber( NodeService ) ;
+//        int num = Graph()->GetServiceNameNumber( NodeService ) ;
+        char * aServiceName = (CORBA::String_member ) NodeService.ServiceName ;
+        int num = Graph()->GetNewServiceInstanceNumber( aServiceName ) ;
         ostringstream astr ;
         astr << num << ends ;
         const char * n_instance = astr.str().c_str() ;
@@ -759,8 +761,13 @@ GraphEditor::InNode * GraphEditor::OutNode::AddNode(
     cdebug << "ERROR NodeName is NULL or already exists." << endl ;
   }
 //  delete [] aNodeName ;
-  cdebug_out << "GraphEditor::OutNode::AddNode" << endl;
   _Valid = false ;
+  if ( Nd == NULL ) {
+    cdebug_out << "GraphEditor::OutNode::AddNode : NULL" << endl;
+  }
+  else {
+    cdebug_out << "GraphEditor::OutNode::AddNode : " << Nd << " " << Nd->Name() << endl;
+  }
   return Nd ;
 }
 
@@ -1033,22 +1040,26 @@ bool GraphEditor::OutNode::Executable() {
   return _Executable ;
 }
 
-const CORBA::Any *GraphEditor::OutNode::GetInData(
+//JR 30.03.2005const CORBA::Any *GraphEditor::OutNode::GetInData(
+const CORBA::Any GraphEditor::OutNode::GetInData(
                               const char * ToNodeName ,
                               const char * ToParameterName ) {
 //  cdebug_in << "GraphEditor::OutNode::GetInData " << ToNodeName
 //            << " " << ToParameterName << endl ;
-  const CORBA::Any * retdata = Graph()->PortInData( ToNodeName , ToParameterName ) ;
+//JR 30.03.2005  const CORBA::Any * retdata = Graph()->PortInData( ToNodeName , ToParameterName ) ;
+  const CORBA::Any retdata = Graph()->PortInData( ToNodeName , ToParameterName ) ;
 //  cdebug_out << "GraphEditor::OutNode::GetInData" << endl ;
   return retdata ;
 }
 
-const CORBA::Any *GraphEditor::OutNode::GetOutData(
+//JR 30.03.2005const CORBA::Any *GraphEditor::OutNode::GetOutData(
+const CORBA::Any GraphEditor::OutNode::GetOutData(
                               const char * FromNodeName ,
                               const char * FromParameterName ) {
 //  cdebug_in << "GraphEditor::OutNode::GetOutData " << FromNodeName
 //            << " " << FromParameterName << endl ;
-  const CORBA::Any * retdata = Graph()->PortOutData( FromNodeName , FromParameterName ) ;
+//JR 30.03.2005  const CORBA::Any * retdata = Graph()->PortOutData( FromNodeName , FromParameterName ) ;
+  const CORBA::Any retdata = Graph()->PortOutData( FromNodeName , FromParameterName ) ;
 //  cdebug_out << "GraphEditor::OutNode::GetOutData" << endl ;
   return retdata ;
 }

diff --git a/src/GraphEditor/DataFlowEditor_OutNode.hxx b/src/GraphEditor/DataFlowEditor_OutNode.hxx
index 3cfb35556d5ef5d00d300d093f1dee63a7ce12dc..c8640b0f50cbd6ca1985a411c999d35b3387458e 100644 (file)
--- a/src/GraphEditor/DataFlowEditor_OutNode.hxx
+++ b/src/GraphEditor/DataFlowEditor_OutNode.hxx
@@ -302,10 +302,12 @@ namespace GraphEditor {
       // in-port of type "InPortType".  Called from IsLinksCompatible() and Link_Impl::IsValid().
       bool IsCompatible( const char* OutPortType, const char* InPortType ) const;
 
-      const CORBA::Any *GetInData( const char *ToNodeName ,
-                                   const char *ToParameterName ) ;
-      const CORBA::Any *GetOutData( const char *FromNodeName ,
-                                    const char *FromParameterName ) ;
+//JR 30.03.2005      const CORBA::Any *GetInData( const char *ToNodeName ,
+      const CORBA::Any GetInData( const char *ToNodeName ,
+                                  const char *ToParameterName ) ;
+//JR 30.03.2005      const CORBA::Any *GetOutData( const char *FromNodeName ,
+      const CORBA::Any GetOutData( const char *FromNodeName ,
+                                   const char *FromParameterName ) ;
   } ;
 
 };