diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-10-12 03:38:12 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2000-10-12 03:38:12 +0000 |
| commit | 0fd9b871decb431a6615c6ec8ca1d901431d8b3d (patch) | |
| tree | 77e1869361f5468706bcfd028bcac4567c189973 | |
| parent | 4880fb91abdb5811995ff18010d1ba506707e7d2 (diff) | |
| download | ATCD-0fd9b871decb431a6615c6ec8ca1d901431d8b3d.tar.gz | |
ChangeLogTag:Wed Oct 11 19:13:23 2000 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 6 |
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4e82ead531e..4fb0752fc35 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Wed Oct 11 19:13:23 2000 Ossama Othman <ossama@uci.edu> + + * tao/ORB_Core.cpp (fini): + + Deallocate reactor registry prior to deallocating the resource + factory. The resource factory must still exist when + deallocating the reactor registry since the resource factory + reclaims some resources during reactory registry destruction. + This fixes a memory access violation. + Wed Oct 11 22:00:00 2000 Angelo Corsaro <corsaro@cs.wustl.edu> * tao/Profile.cpp: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index ab58fc19ccf..bbff06a4a71 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1294,6 +1294,10 @@ TAO_ORB_Core::fini (void) (void) TAO_Internal::close_services (); + + delete this->reactor_registry_; + + // @@ This is not needed since the default resource factory // is statically added to the service configurator, fredk if (!this->resource_factory_from_service_config_) @@ -1311,8 +1315,6 @@ TAO_ORB_Core::fini (void) if (!this->server_factory_from_service_config_) delete server_factory_; - delete this->reactor_registry_; - delete this; return 0; |