summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tao/Acceptor_Impl.cpp3
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5e00116ca0c..32af566d14d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Feb 9 13:45:47 UTC 2011 Vladimir Zykov <vladimir.zykov@prismtech.com>
+
+ * tao/Acceptor_Impl.cpp:
+ Fixed unnecessary initialization of a default reactor that was done
+ through a call to ACE_Reactor::instance() as the default parameter
+ to the constructor of ACE_Accept_Strategy (base of
+ TAO_Accept_Strategy).
+
Thu Feb 3 16:32:53 UTC 2011 Martin Corino <corino_m@remedy.nl>
* TAO_IDL/be/be_union.cpp:
diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index c1e4a914064..76e7e32a3bc 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -193,7 +193,8 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
TAO_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::TAO_Accept_Strategy (TAO_ORB_Core *orb_core)
- : orb_core_ (orb_core)
+ : ACCEPT_STRATEGY_BASE (orb_core->reactor ())
+ , orb_core_ (orb_core)
{
}