diff options
| author | msmit <msmit@remedy.nl> | 2011-08-29 07:19:15 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-08-29 07:19:15 +0000 |
| commit | 89778a3014183585cdaa3d2e9abf4f4688309b4e (patch) | |
| tree | b2a5a8457e2d01a85289338e3fe382b129d79ff5 | |
| parent | a5767de2076663a9a9b7b37143d04100cff1ba89 (diff) | |
| download | ATCD-89778a3014183585cdaa3d2e9abf4f4688309b4e.tar.gz | |
Mon Aug 29 07:20:29 UTC 2011 Marcel Smit <msmit@remedy.nl>
* orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp:
Fixed runtime issues in orbsvcs.
* tests/OBV/ValueBox/client.cpp:
Fixed runtime issues.
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/OBV/ValueBox/client.cpp | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index c4f0cea454e..d9b70478ca9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Mon Aug 29 07:20:29 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp: + Fixed runtime issues in orbsvcs. + + * tests/OBV/ValueBox/client.cpp: + Fixed runtime issues. + Fri Aug 26 11:09:12 UTC 2011 Marcel Smit <msmit@remedy.nl> * DevGuideExamples/ValueTypes/Bank/client.cpp: diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index 6d09dfb208c..07aa3444b4d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -192,8 +192,6 @@ TAO_ESF_Copy_On_Write_Write_Guard<COLLECTION,ITERATOR,ACE_SYNCH_USE>:: } // Delete outside the mutex, because it may take a long time. tmp->_decr_refcnt (); - - delete this->copy; } // **************************************************************** diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index 1bc92a579c4..d4367b0dff2 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -679,10 +679,6 @@ int test_boxed_sequence_invocations (Test * test_object) OBV_VERITY ((*p3)[1] == (*p1)[1]*5); OBV_VERITY ((*p3)[2] == (*p1)[2]*5); OBV_VERITY ((*p3)[3] == (*p1)[3]*5); - - p1->_remove_ref (); - p2->_remove_ref (); - p3->_remove_ref (); } catch (const CORBA::Exception& ex) { |