diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancer_i.i | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i | 2 | ||||
| -rw-r--r-- | TAO/tao/Invocation.cpp | 8 |
4 files changed, 19 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 33aea03f8aa..ae3cce0b763 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,16 @@ +Fri Jun 9 15:20:11 2000 Ossama Othman <ossama@uci.edu> + + * tao/Invocation.cpp (location_forward): + + Do not copy the TAO_MProfile passed to + TAO_Stub::add_forward_profiles() since that method already + copies it. This fixes a memory leak. + Reported by Sangwoo Jin <swjinjin@sei.co.kr> + + * orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i (disconnect): + + Fixed unused argument warning. + Fri Jun 09 15:45:01 2000 David L. Levine <levine@cs.wustl.edu> * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i index b801158aae4..d7938c563d8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancer_i.i @@ -5,7 +5,7 @@ ACE_INLINE void TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama, what is the we cannot raise that exception here! diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i index b801158aae4..d7938c563d8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LoadBalancer_i.i @@ -5,7 +5,7 @@ ACE_INLINE void TAO_LB_LoadBalancer::disconnect (TAO_LB_ReplicaProxy *proxy, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Environment &) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ Ossama, what is the we cannot raise that exception here! diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index bf282267752..d535b9da333 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -518,11 +518,11 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // New for Multiple profile. Get the MProfile list from the // forwarded object refererence - this->stub_->add_forward_profiles (*stubobj->make_profiles ()); + this->stub_->add_forward_profiles (stubobj->base_profiles ()); // store the new profile list and set the first forwarding profile - // note: this has to be and is thread safe. Also make_profiles() returns - // a pointer to a new MProfile object which we give to our - // TAO_Stub. + // note: this has to be and is thread safe. + // @@ TAO_Stub::add_forward_profiles() already makes a copy of the + // MProfile, so do not make a copy here. // @@ Why do we clear the environment? // ACE_TRY_ENV.clear (); |