diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp index a4cbf29ab8f..42b4ba4bf6e 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp @@ -55,12 +55,12 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) { - + PortableServer::ObjectId_var id = this->poa_->activate_object (servant, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_var obj = this->poa_->id_to_reference (id.in (), ACE_TRY_ENV); @@ -70,7 +70,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ this->orb_->object_to_string (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return str._retn (); } @@ -137,7 +137,7 @@ TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activ anyval <<= this->orb_->object_to_string (media_ctrl->_this (ACE_TRY_ENV), ACE_TRY_ENV); ACE_TRY_CHECK; - + this->vdev_->define_property ("Related_MediaCtrl", anyval, ACE_TRY_ENV); @@ -311,7 +311,7 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::act ACE_TRY_ENV); ACE_TRY_CHECK; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ())); - + this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_TRY_ENV); ACE_TRY_CHECK; stream_endpoint_b->_remove_ref (ACE_TRY_ENV); @@ -365,7 +365,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::TAO_AV_Child_Pro // Initializes the ORB, activates the objects, and release the semaphore template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl> int -TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, +TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, char **argv, CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) @@ -376,7 +376,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, this->orb_ = orb; this->poa_ = poa; - + // create the objects and activate them in the poa this->activate_objects (argc, argv, @@ -413,15 +413,15 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl> char * -TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, +TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) { - + PortableServer::ObjectId_var id = this->poa_->activate_object (servant, ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + CORBA::Object_var obj = this->poa_->id_to_reference (id.in (), ACE_TRY_ENV); @@ -431,7 +431,7 @@ TAO_AV_Child_Process <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_with_poa this->orb_->object_to_string (obj.in (), ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + return str._retn (); } @@ -595,11 +595,10 @@ template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl> int TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_Value *tv) { - int result = -1; ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - result = this->orb_->run (tv, ACE_TRY_ENV); + this->orb_->run (tv, ACE_TRY_ENV); ACE_TRY_CHECK; } ACE_CATCHANY @@ -608,7 +607,7 @@ TAO_AV_Child_Process <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_V return -1; } ACE_ENDTRY; - return result; + return 0; } // release the semaphore the parent is waiting on |