summaryrefslogtreecommitdiff
path: root/TAO/tao/ORB_Core.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/ORB_Core.cpp')
-rw-r--r--TAO/tao/ORB_Core.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 4948f0b8f1d..52400658b08 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1225,15 +1225,18 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
void
TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
{
+ // @@Marek, I would as well like this to be stored in per-orb TSS
+ // instead of globasl TSS. Please see TAO_ORB_Core_TSS_Resources in
+ // ORB_Core.h for details.
if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0)
- {
- ACE_DEBUG ((LM_WARNING,
- "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
- delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
- }
+ {
- TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
+ ACE_DEBUG ((LM_WARNING,
+ "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
+ delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+ }
+ TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
}
void