diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-10 19:03:35 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-03-10 19:03:35 +0000 |
commit | 4e36d5a4add3d1e8b62800b4b1e6ce10036ad14c (patch) | |
tree | f5e9f9bdbf12c399bbf7704106c564aaaa4904f8 /TAO | |
parent | 2a709d8ecfa6b1c5ffd4fa14fd235aef70ada87b (diff) | |
download | ATCD-4e36d5a4add3d1e8b62800b4b1e6ce10036ad14c.tar.gz |
ChangeLogTag:Mon Mar 10 11:03:14 2003 Ossama Othman <ossama@uci.edu>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 23 | ||||
-rw-r--r-- | TAO/examples/Callback_Quoter/Supplier_i.cpp | 14 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_ClientRequestInfo.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/DII_ClientRequestInfo.h | 2 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/Request.cpp | 4 |
5 files changed, 35 insertions, 12 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c6989ac4578..fa61bd7ce6b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,26 @@ +Mon Mar 10 11:03:14 2003 Ossama Othman <ossama@uci.edu> + + * tao/DynamicInterface/DII_ClientRequestInfo.h (request_): + + Changed the type of this class member from CORBA::Request_var to + CORBA::Request_ptr. There is no need to use "_var" type in this + case. + + * tao/DynamicInterface/DII_ClientRequestInfo.cpp + (TAO_DII_ClientRequestInfo): + + No need to increase the reference count since the "request_" + member is no longer a "_var" type, and since the + TAO_DII_ClientRequestInfo instance used in the + CORBA::Request::invoke() methd is local to that method. This is + a lighter weight solution to the problem that Phil Mesnier + detected and fixed since no CORBA::Request reference count locks + are used. + + * examples/Callback_Quoter/Supplier_i.cpp (run): + + Fixed unused value warning. + Mon Mar 10 08:10:02 2003 Ossama Othman <ossama@uci.edu> * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp (setup_multicast): diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp index b3b3072d046..2d3627bf379 100644 --- a/TAO/examples/Callback_Quoter/Supplier_i.cpp +++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp @@ -197,16 +197,14 @@ Supplier::run (void) "Periodic stockfeed", period, period); - if ( timer_id== -1) - ACE_ERROR_RETURN ((LM_ERROR, - "%p\n", - "schedule_timer"), - -1); + if (timer_id == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "%p\n", + "schedule_timer"), + -1); // The reactor starts executing in a loop. - this->reactor_used ()->run_event_loop (); - - return 0; + return this->reactor_used ()->run_reactor_event_loop (); } diff --git a/TAO/tao/DynamicInterface/DII_ClientRequestInfo.cpp b/TAO/tao/DynamicInterface/DII_ClientRequestInfo.cpp index c0fd57fc78c..830ecefc746 100644 --- a/TAO/tao/DynamicInterface/DII_ClientRequestInfo.cpp +++ b/TAO/tao/DynamicInterface/DII_ClientRequestInfo.cpp @@ -13,9 +13,9 @@ ACE_RCSID (DynamicInterface, TAO_DII_ClientRequestInfo::TAO_DII_ClientRequestInfo ( TAO_GIOP_Invocation *_tao_invocation, CORBA::Object_ptr _tao_target, - CORBA::Request * request) + CORBA::Request_ptr request) : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target), - request_ (CORBA::Request::_duplicate (request)), + request_ (request), result_ (0) { } diff --git a/TAO/tao/DynamicInterface/DII_ClientRequestInfo.h b/TAO/tao/DynamicInterface/DII_ClientRequestInfo.h index e0c06f72500..def225409d8 100644 --- a/TAO/tao/DynamicInterface/DII_ClientRequestInfo.h +++ b/TAO/tao/DynamicInterface/DII_ClientRequestInfo.h @@ -71,7 +71,7 @@ private: private: - CORBA::Request_var request_; + CORBA::Request_ptr request_; CORBA::Long result_; }; diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 8d11e801c04..0b3adee0ffd 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -169,7 +169,9 @@ CORBA::Request::invoke (ACE_ENV_SINGLE_ARG_DECL) &call, _invoke_status); - TAO_DII_ClientRequestInfo _tao_ri (&call,this->target_ ,this); + TAO_DII_ClientRequestInfo _tao_ri (&call, + this->target_, + this); #endif /* TAO_HAS_INTERCEPTORS */ // Loop as needed for forwarding. |