From a35170821a040836d03e4b3ca2209a586adf7401 Mon Sep 17 00:00:00 2001 From: crodrigu Date: Wed, 1 May 2002 01:03:27 +0000 Subject: ChangeLogTag: Wed May 1 00:59:39 UTC 2002 Craig Rodrigues --- TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp') diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp index f70a5c8b9e9..53cec723921 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp @@ -35,14 +35,6 @@ TAO_AV_Endpoint_Strategy::TAO_AV_Endpoint_Strategy (void) // Destructor. TAO_AV_Endpoint_Strategy::~TAO_AV_Endpoint_Strategy (void) { -// if (CORBA::is_nil (this->stream_endpoint_a_) == 0) -// CORBA::release (this->stream_endpoint_a_); - -// if (CORBA::is_nil (this->stream_endpoint_b_) == 0) -// CORBA::release (this->stream_endpoint_b_); - -// if (CORBA::is_nil (this->stream_endpoint_b_) == 0) -// CORBA::release (this->vdev_); } @@ -246,7 +238,7 @@ TAO_AV_Endpoint_Process_Strategy::get_vdev (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_CHECK; // Check if valid - if (CORBA::is_nil (this->vdev_)) + if (CORBA::is_nil (this->vdev_.in() )) ACE_ERROR_RETURN ((LM_ERROR, " could not resolve Stream_Endpoint_B in Naming service <%s>\n"), -1); @@ -289,8 +281,8 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s -1); // return the object references - stream_endpoint = this->stream_endpoint_a_; - vdev = this->vdev_; + stream_endpoint = AVStreams::StreamEndPoint_A::_duplicate( this->stream_endpoint_a_.in() ); + vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); return 0; } @@ -329,7 +321,7 @@ TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (ACE_ENV_SINGLE_ARG_DECL ACE_TRY_CHECK; // Check for validity - if (CORBA::is_nil (this->stream_endpoint_a_)) + if (CORBA::is_nil (this->stream_endpoint_a_.in() )) ACE_ERROR_RETURN ((LM_ERROR, " could not resolve Stream_Endpoint_A in Naming service <%s>\n"), -1); @@ -376,8 +368,8 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_ ACE_ENV_ARG_PARAMETER))); ACE_TRY_CHECK; - stream_endpoint = this->stream_endpoint_b_; - vdev = this->vdev_; + stream_endpoint = AVStreams::StreamEndPoint_B::_duplicate ( this->stream_endpoint_b_.in() ); + vdev = AVStreams::VDev::_duplicate( this->vdev_.in() ); } ACE_CATCHANY { -- cgit v1.2.1