merge from trunk

8 files changed, 44 insertions, 8 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 5e0c110dc36..a16bdcc49c1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,35 @@
+Mon May 13 14:15:13 UTC 2013  Brian Johnson  <johnsonb@ociweb.com>
+
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc:
+
+          Renamed mpc file to prevent hitting the maximum filename length on windows.
+
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc:
+        * orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc:
+
+          Removed these files.
+
+Mon May 13 07:14:00 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+          Make 2.1.9 public and prepare for the next minor release
+
+Mon May 13 08:52:11 CEST 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO version 2.1.9 released.
+
+Fri May 10 09:21:17 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/IORTable_Locator/async_server.cpp:
+          Fixed LynxOS compile warning
+
+Thu May  9 19:52:26 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * orbsvcs/tests/ImplRepo/servers_interact_on_startup/run_test.pl:
+
+          Improvements to test performance on windows, aix.
+
 Wed May  8 14:56:24 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * tao/Dynamic_TP/DTP_Thread_Pool.cpp:
diff --git a/TAO/NEWS b/TAO/NEWS
index ae251b4e8df..2dfb50db8c9 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,3 +1,6 @@
+USER VISIBLE CHANGES BETWEEN TAO-2.1.9 and TAO-2.2.0
+====================================================
+
 USER VISIBLE CHANGES BETWEEN TAO-2.1.8 and TAO-2.1.9
 ====================================================
 
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 467531cb1fe..5ea368fc659 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.1.8
-    ACE VERSION: 6.1.8
+    TAO VERSION: 2.1.9
+    ACE VERSION: 6.1.9
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index 187eefd8542..b0d5e9bd855 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.1.8, released Thu Mar 14 09:04:46 CET 2013
+This is TAO version 2.1.9, released Mon May 13 08:52:11 CEST 2013
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
index fd4436446ba..fd4436446ba 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DeadMemberDetection_App_Ctrl.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/DMD_App_Ctrl.mpc
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
index 48c4148da67..48c4148da67 100755
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DeadMemberDetection_Inf_Ctrl.mpc
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/DMD_Inf_Ctrl.mpc
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 1c6d9cff1fc..b1984a01cfd 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 1
-#define TAO_BETA_VERSION 8
-#define TAO_VERSION "2.1.8"
+#define TAO_BETA_VERSION 9
+#define TAO_VERSION "2.1.9"
diff --git a/TAO/tests/IORTable_Locator/async_server.cpp b/TAO/tests/IORTable_Locator/async_server.cpp
index 0b5dbcc48c5..73757fdd503 100644
--- a/TAO/tests/IORTable_Locator/async_server.cpp
+++ b/TAO/tests/IORTable_Locator/async_server.cpp
@@ -158,19 +158,20 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       // Create task.
-      IORTable::Locator_var iorloc;
+      IORTable::Locator_ptr iorloc_ptr;
       if (use_async_locator)
         {
-          ACE_NEW_RETURN (iorloc,
+          ACE_NEW_RETURN (iorloc_ptr,
                           AsyncLocatorTask (orb.in ()),
                           1);
         }
       else
         {
-          ACE_NEW_RETURN (iorloc,
+          ACE_NEW_RETURN (iorloc_ptr,
                           SyncLocatorTask (orb.in ()),
                           1);
         }
+      IORTable::Locator_var iorloc = iorloc_ptr;
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Server - using ior table object: %C\n"),