summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2014-11-05 00:04:55 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2014-11-05 00:04:55 +0000
commit6048316cb937989e4573707a358227cda1f8747f (patch)
treea1f429dbfdb7bd32740a804bbe98b14f29b68d91
parent32b99816480a198cdf17aa5e918d1f424e5f8ac1 (diff)
downloadATCD-6048316cb937989e4573707a358227cda1f8747f.tar.gz
Tue Nov 4 23:58:48 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* orbsvcs/tests/ImplRepo/NotifyService/run_test.pl: Turns out the svc.conf triggers a thread and in some cases that resulted in a pure virtual call on shutdown. The PVC is related to type code operations on NotifyExt::ThreadPoolParams. * orbsvcs/tests/ImplRepo/NotifyService/ntfy.conf: Removed this file.
-rw-r--r--TAO/ChangeLog10
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/NotifyService/ntfy.conf3
-rwxr-xr-xTAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl2
3 files changed, 11 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 9df8d3b368d..894ec4c8606 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Tue Nov 4 23:58:48 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * orbsvcs/tests/ImplRepo/NotifyService/run_test.pl:
+ Turns out the svc.conf triggers a thread and in some cases that
+ resulted in a pure virtual call on shutdown. The PVC is related
+ to type code operations on NotifyExt::ThreadPoolParams.
+
+ * orbsvcs/tests/ImplRepo/NotifyService/ntfy.conf:
+ Removed this file.
+
Tue Nov 4 14:39:27 UTC 2014 Johnny Willemsen <jwillemsen@remedy.nl>
* etc/tao_anytypecode.doxygen:
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/ntfy.conf b/TAO/orbsvcs/tests/ImplRepo/NotifyService/ntfy.conf
deleted file mode 100644
index 8d973e09c33..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/ntfy.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-## $Id$
-
-static Notify_Default_Event_Manager_Objects_Factory "-DispatchingThreads 1"
diff --git a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl
index e13243361bc..b324cd59b58 100755
--- a/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/NotifyService/run_test.pl
@@ -122,7 +122,7 @@ print "-------> Register service\n";
$TI->Arguments("-ORBInitRef ImplRepoService=file://$ti_imriorfile"
. " add CosNotify:1 -c \""
- . "$ns_cmd -boot -NoNameSvc -Factory CosNotify:1/NotifyService -ORBServerId CosNotify -ORBInitRef ImplRepoService=file://$imr_imriorfile -ORBUseIMR 1 -ORBSvcConf ntfy.conf"
+ . "$ns_cmd -boot -NoNameSvc -Factory CosNotify:1/NotifyService -ORBServerId CosNotify -ORBInitRef ImplRepoService=file://$imr_imriorfile -ORBUseIMR 1"
. "\"");
$TI_status = $TI->SpawnWaitKill ($ti->ProcessStartWaitInterval()+45);