summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2001-07-29 17:27:10 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2001-07-29 17:27:10 +0000
commita7325548268d58fa36eb9deeaf5712836dec7b82 (patch)
tree76d13d606a6e245ca879fd19def0ecb3fdfca289
parente9230d013ebcf97812b3dc1308da37d639ca681a (diff)
downloadATCD-a7325548268d58fa36eb9deeaf5712836dec7b82.tar.gz
ChangeLogTag:Sun Jul 29 10:15:13 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a12
-rw-r--r--TAO/tao/TAO_Internal.cpp10
2 files changed, 19 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1753903c7d2..f65dab9df5d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,15 @@
+Sun Jul 29 10:15:13 2001 Ossama Othman <ossama@uci.edu>
+
+ * tao/TAO_Internal.cpp (open_services_i):
+
+ Reverted my change that prevented the default resource factory
+ from being inserted into the Service Repository. The resource
+ factory must be inserted into the Service Repository so that
+ Service Configurator directives such as 'static Resource_Factory
+ "-ORBResources global"' actually work properly. An alternative
+ solution for the dynamic loading problem related the default
+ resource factory is necessary.
+
Sun Jul 29 00:59:28 2001 Ossama Othman <ossama@uci.edu>
* docs/Options.html:
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index 81578b80ce1..8b7f957361d 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -190,12 +190,16 @@ TAO_Internal::open_services_i (int &argc,
// Service Configurator before the ORB is created since it
// will be finalized before the ORB is finalized. The ORB
// requires that a resource factory exist in order to reclaim
- // the reactor during finalization.
+ // the reactor during finalization. Unfortunately, the
+ // resource factory must be inserted into the Service
+ // Repository so that Service Configurator directives such as
+ // 'static Resource_Factory "-ORBResources global"' actually
+ // work properly.
//
// This is only a problem when the ORB is dynamically
// loaded/unloaded.
- // ACE_Service_Config::static_svcs ()->
- // insert (&ace_svc_desc_TAO_Default_Resource_Factory);
+ ACE_Service_Config::static_svcs ()->
+ insert (&ace_svc_desc_TAO_Default_Resource_Factory);
ACE_Service_Config::static_svcs ()->
insert (&ace_svc_desc_TAO_Default_Client_Strategy_Factory);
ACE_Service_Config::static_svcs ()->