diff options
| author | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-12 02:18:02 +0000 |
|---|---|---|
| committer | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-06-12 02:18:02 +0000 |
| commit | 48dfd3ac0bbaaa5091260859e2e79ae01b176664 (patch) | |
| tree | 6947004db5f4bc6b78119c9cc0ea93fd822bd179 /TAO/tao/IIOP_ORB.cpp | |
| parent | a01d0b8ea55bedb117b5f9786f7733f54482f352 (diff) | |
| download | ATCD-48dfd3ac0bbaaa5091260859e2e79ae01b176664.tar.gz | |
ChangeLog entry: Thu Jun 11 21:15:00 1998 Michael Kircher <mk1@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/IIOP_ORB.cpp')
| -rw-r--r-- | TAO/tao/IIOP_ORB.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp index fba16e00ddb..94dc771fd1d 100644 --- a/TAO/tao/IIOP_ORB.cpp +++ b/TAO/tao/IIOP_ORB.cpp @@ -275,11 +275,12 @@ iiop_string_to_object (CORBA::String string, TAO_ServantBase *servant = TAO_ORB_Core_instance ()->orb ()->_get_collocated_servant (data); + // This will increase the ref_count on data by one CORBA_Object *obj = new CORBA_Object (data, servant, servant != 0); - // Clean up in case of error - if (obj == 0) - data->Release (); + // Set the ref_count on data to 1, which is correct, because only + // obj has now a reference to it. + data->Release (); return obj; } |