summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-17 09:10:52 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-11-17 09:10:52 +0000
commitdf24ddcccee1775356c83f67d7a623d97db8d0f8 (patch)
tree3fc63795e459309b6db83c16ca65f4e58f4c9e21
parent70d1a1321207f6b4366fe55110687a802dc94f66 (diff)
downloadATCD-df24ddcccee1775356c83f67d7a623d97db8d0f8.tar.gz
Fri Nov 17 09:08:00 UTC 2006 Simon Massey <sma@prismtech.com>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/NEWS3
-rw-r--r--TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp4
3 files changed, 14 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 935f1d103b2..6e0e39cf8f6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 17 09:08:00 UTC 2006 Simon Massey <sma@prismtech.com>
+
+ * NEWS:
+ * orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+
+ Slight tidy-up, to keep release notes / NEWS in step.
+ Wallace Zhang's fix for shutdown run-time windows test problem.
+
Thu Nov 16 10:20:00 UTC 2006 Simon Massey <sma@prismtech.com>
* tao/IIOP_Profile.cpp:
diff --git a/TAO/NEWS b/TAO/NEWS
index ebd311b1c39..8f0c5445b51 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -10,6 +10,7 @@ PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
USER VISIBLE CHANGES BETWEEN TAO-1.5.3 and TAO-1.5.4
====================================================
+
. Added support for ACE_Dev_Poll_Reactor to Advanced_Resource_Factory.
. Improved tao_idl performance, particularly over networked
@@ -36,7 +37,7 @@ USER VISIBLE CHANGES BETWEEN TAO-1.5.3 and TAO-1.5.4
. Fixed Bugzilla #2699, by uninlining generated code for the
TIE template classes. Inlining of virtual functions in this
code was causing problems with RTTI on some compilers. As a side
- result the idl compiler doesn't generate a S_T.inl file anymore
+ result, the idl compiler doesn't generate a S_T.inl file anymore.
. Fixed a bug where calling _set_policy_overrides() on a collocated servant
would return an unusable object reference.
diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
index ebb2309b7f7..41195ba4376 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Bug_2604_Regression/MessengerServer.cpp
@@ -73,6 +73,10 @@ main (int argc, char *argv[])
orb->run ();
+ // the following 1 second of sleep is needed to help
+ // Windows with "server shutdown too quickly so the
+ // client cannot get the reply" issue.
+ ACE_OS::sleep(1);
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Messenger server shutting "
"down.\n")));
root_poa->destroy (1, 1);