summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog12
-rw-r--r--TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp1
-rw-r--r--TAO/examples/POA/Explicit_Activation/alternate.conf2
3 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index b920b2cc062..404b836f554 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Feb 27 16:28:51 2004 Irfan Pyarali <irfan@oomworks.com>
+
+ * examples\POA\Explicit_Activation\Alt_Resources\Resource_Factory.cpp (allocate_reactor_impl):
+
+ Set errno to zero before creating the Reactor. Otherwise, the
+ code in TAO_Default_Resource_Factory::get_reactor() improperly
+ think there was a failure in creating the Reactor.
+
+ * examples\POA\Explicit_Activation\alternate.conf:
+
+ Removed old "-ORBresources global" option.
+
Fri Feb 27 11:33:39 2004 Huang-Ming Huang <hh1@cse.wustl.edu>
* orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.cpp:
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
index c7da744e83c..9b6ae031814 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Resource_Factory.cpp
@@ -6,6 +6,7 @@
ACE_Reactor_Impl *
My_Resource_Factory::allocate_reactor_impl (void) const
{
+ errno = 0;
ACE_DEBUG ((LM_DEBUG,
"Using alternate reactor\n"));
diff --git a/TAO/examples/POA/Explicit_Activation/alternate.conf b/TAO/examples/POA/Explicit_Activation/alternate.conf
index 44f9731f156..262dc5b4308 100644
--- a/TAO/examples/POA/Explicit_Activation/alternate.conf
+++ b/TAO/examples/POA/Explicit_Activation/alternate.conf
@@ -1,4 +1,4 @@
# Refer to Alternate_Resource_Factory/README for details
-dynamic Resource_Factory Service_Object * Alt_Resources/Alt_Resource_Factory:_make_My_Resource_Factory() "-ORBresources global"
+dynamic Resource_Factory Service_Object * Alt_Resources/Alt_Resource_Factory:_make_My_Resource_Factory()