diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 1997-08-28 22:58:56 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 1997-08-28 22:58:56 +0000 |
| commit | 5cda53835f72ae73c024bfff69571296e7ea4da3 (patch) | |
| tree | e3aea84f4184e9b365cb398ce554d6afc7014af5 /TAO | |
| parent | dcb10aaffa765f19f11b7d0830ca270c07ebb798 (diff) | |
| download | ATCD-5cda53835f72ae73c024bfff69571296e7ea4da3.tar.gz | |
* tao/orbobj.i (CORBA_ORB): Removed assertion that was incorrect
b/c our ORB object is a singleton and not dynamically allocated,
thus the refcount can only reach zero at the end of its life.
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/tao/orbobj.i | 3 | ||||
| -rw-r--r-- | TAO/tests/Cubit/TAO/clnt.cpp | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 5fe7189d30d..e8f86f7efa8 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,7 +1,8 @@ Thu Aug 28 14:04:44 1997 Chris Cleeland <cleeland@cs.wustl.edu> - * tests/Cubit/TAO/clnt.cpp (main): Added release of the orb - pointer. + * tao/orbobj.i (CORBA_ORB): Removed assertion that was incorrect + b/c our ORB object is a singleton and not dynamically allocated, + thus the refcount can only reach zero at the end of its life. * tao/typecode.cpp (TC_Private_State): Relocated the delete of tc_discriminator_type_ to be after the deletion of the label list. diff --git a/TAO/tao/orbobj.i b/TAO/tao/orbobj.i index 7ba19c40100..c303e954910 100644 --- a/TAO/tao/orbobj.i +++ b/TAO/tao/orbobj.i @@ -22,7 +22,8 @@ CORBA_ORB::~CORBA_ORB (void) if (! server_factory_from_service_config_) delete server_factory_; - assert (refcount_ == 0); + // This assertion isn't valid because our ORB is a singleton + // assert (refcount_ == 0); } // CORBA dup/release build on top of COM's (why not). diff --git a/TAO/tests/Cubit/TAO/clnt.cpp b/TAO/tests/Cubit/TAO/clnt.cpp index fe2f410295c..5a27f2977d3 100644 --- a/TAO/tests/Cubit/TAO/clnt.cpp +++ b/TAO/tests/Cubit/TAO/clnt.cpp @@ -496,7 +496,6 @@ main (int argc, char *argv[]) } CORBA::release (objref); - CORBA::release (orb_ptr); return (error_count == 0) ? 0 : 1; } |