summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-01-28 20:17:19 +0000
committerpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-01-28 20:17:19 +0000
commit04131d480d6053f42a999a14f0f2ccb0039f73ee (patch)
treef48b7b6b5e36a60d3bd179cbda6595998701e2c2
parentcea3a0cdbd40d8c7608c7d8953275f2b1432facd (diff)
downloadATCD-04131d480d6053f42a999a14f0f2ccb0039f73ee.tar.gz
ChangeLogTag: Tue Jan 28 14:27:01 2003 Pradeep Gore <pradeep@oomworks.com>
-rw-r--r--TAO/ChangeLog9
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/Properties.cpp15
-rw-r--r--THANKS1
3 files changed, 24 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index af87efa5e36..cce6c734deb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jan 28 14:27:01 2003 Pradeep Gore <pradeep@oomworks.com>
+
+ * orbsvcs\orbsvcs\Notify\Properties.cpp:
+ In case no conf. file is specified, the EC will default to reactive concurrency.
+ This fixes the problem of the Notify crashing without any
+ conf. file. Thanks to Dennis Sporcic <dennis@hsa.com.au> and
+ Frederic Langlet <Frederic.Langlet@alcatel.com> for reporting
+ this problem.
+
Mon Jan 27 23:01:43 2003 Frank Hunleth <frank@hunleth.com>
* orbsvcs\orbsvcs\PortableGroup\UIPMC_Transport.cpp: Fixed code
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
index 8cc013573bd..421fd42a00a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,6 +1,7 @@
// $Id$
#include "Properties.h"
+#include "orbsvcs/NotifyExtC.h"
#include "tao/debug.h"
#if ! defined (__ACE_INLINE__)
@@ -10,8 +11,20 @@
ACE_RCSID(RT_Notify, TAO_NS_Properties, "$Id$")
TAO_NS_Properties::TAO_NS_Properties (void)
- :asynch_updates_ (0)
+ : factory_ (0)
+ , builder_ (0)
+ , thr_sched_policy_ (THR_SCHED_DEFAULT)
+ , thr_scope_policy_ (THR_SCOPE_PROCESS)
+ , asynch_updates_ (0)
{
+ // In case no conf. file is specified, the EC will default to reactive concurrency.
+ NotifyExt::ThreadPoolParams tp_params =
+ {0, 0, 0, 0, 0, 0, 0 };
+
+ this->ec_qos_.length (1);
+ this->ec_qos_[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
+ this->ec_qos_[0].value <<= tp_params;
+
if (TAO_debug_level > 1)
ACE_DEBUG ((LM_DEBUG, "in TAO_Properties ctos %x\n", this));
}
diff --git a/THANKS b/THANKS
index ee96b2c10f0..1501b94c2c3 100644
--- a/THANKS
+++ b/THANKS
@@ -1655,6 +1655,7 @@ Dima Scub <dima_scub@sniip.ru>
Volodymyr Orlenko <vorlenko@jaalam.com>
Grigory <grig@plesk.com>
Michael Soden <soden@ikv.de>
+Dennis Sporcic <dennis@hsa.com.au>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile