merge from trunk

49 files changed, 218 insertions, 152 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 3414f95f05a..23e090bba05 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,54 @@
+Mon May 13 07:13:57 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * NEWS:
+        * bin/diff-builds-and-group-fixed-tests-only.sh:
+        * docs/Download.html:
+        * docs/bczar/bczar.html:
+        * etc/index.html:
+          Make 6.1.9 public and prepare for the next minor release
+
+Mon May 13 08:52:11 CEST 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ACE version 6.1.9 released.
+
+Fri May 10 20:36:13 UTC 2013  Steve Huston  <shuston@riverace.com>
+
+        * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: Advance the
+          iterator while freeing items in close() to avoid an infinite
+          loop. Thanks to George Chen for finding this problem.
+
+        * tests/Unbounded_Set_Test.cpp: Added a allocate/iterate/free cycle
+          similar to the one above to catch this type of thing if it pops
+          up again.
+
+        * THANKS: Added George Chen.
+
+Fri May 10 08:59:43 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Compiler_Features_17_Test.cpp:
+          Added another C++11 test case
+
+Thu May  9 17:14:47 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Thread_Manager_Test.cpp (worker): Fixed %s to %C to work
+          properly with ACE_DEBUG.  Thanks to Johnny for reporting this.
+
+Thu May  9 14:05:28 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * tests/Thread_Manager_Test.cpp (worker): Removed unused "len"
+          variable to fix a warning.  Thanks to Johnny for reporting this.
+
+Wed May  8 19:04:22 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_Thread.inl (ACE_OS::thr_id): Fixed a warning on
+          Windows.  Thanks to Johnny for reporting this.
+
+Wed May  8 13:52:54 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/OS_NS_Thread.inl (ACE_OS::thr_id): Replaced the call to
+          ACE_Thread::self() with ACE_OS::thr_self().  Thanks to Johnny
+          Willemsen for reporting this.
+
 Tue May  7 15:04:24 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
         * ace/OS_NS_Thread.{h,inl}: Added a new ACE_OS::thr_id() method
@@ -6,8 +57,8 @@ Tue May  7 15:04:24 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
 Thu Apr 25 16:51:06 UTC 2013  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
 
-        * ace/Svc_Handler.h: 
-          ace/Connector.h: 
+        * ace/Svc_Handler.h:
+          ace/Connector.h:
           ace/Acceptor.h:  Added template parameter documentation.
           Thanks to Clyde Gerber <clyde_gerber at symantec dot com> for
           contributing this.
@@ -144,7 +195,6 @@ Fri Apr 12 19:30:05 UTC 2013  Huang-Ming Huang  <huangh@ociweb.com>
         * tests/Log_Msg_Test.cpp:
         Fixed problem for WCHAR build
 
->>>>>>> .r97068
 Thu Apr 11 19:53:22 UTC 2013  Huang-Ming Huang  <huangh@ociweb.com>
 
         * ace/Log_Category.h:
diff --git a/ACE/NEWS b/ACE/NEWS
index 4f61ae14443..222743f30cf 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,3 +1,6 @@
+USER VISIBLE CHANGES BETWEEN ACE-6.1.9 and ACE-6.2.0
+====================================================
+
 USER VISIBLE CHANGES BETWEEN ACE-6.1.8 and ACE-6.1.9
 ====================================================
 
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 6c3e5de79a5..d2da33e6363 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.1.8
+    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/ACE/THANKS b/ACE/THANKS
index b9ac37833d2..cb796a3759a 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2380,6 +2380,7 @@ Rudy Pot <rpot at aweta dot nl>
 Neil Youngman <ny at youngman dot org dot uk>
 Andreas Florath <andreas at florath dot org>
 Clyde Gerber <clyde_gerber at symantec dot com>
+George Chen <ace dot gc dot pthzfoldr at gmail dot com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/VERSION b/ACE/VERSION
index 5108ebf6026..e0970eebdc6 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.1.8, released Thu Mar 14 09:04:46 CET 2013
+This is ACE version 6.1.9, released Mon May 13 08:52:11 CEST 2013
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index eac4e1627fa..6a3d6232358 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -54,12 +54,11 @@ ACE_Thread_ID::to_string (char *thr_string) const
   ACE_OS::sprintf (thr_string, "%u",
                    static_cast <unsigned> (this->thread_id_));
 #else
-  // Yes, this is an ugly C-style cast, but the
-  // correct C++ cast is different depending on
-  // whether the t_id is an integral type or a pointer
-  // type. FreeBSD uses a pointer type, but doesn't
-  // have a _np function to get an integral type like
-  // other OSes, so use the bigger hammer.
+  // Yes, this is an ugly C-style cast, but the correct C++ cast is
+  // different depending on whether the t_id is an integral type or a
+  // pointer type. FreeBSD uses a pointer type, but doesn't have a _np
+  // function to get an integral type like other OSes, so use the
+  // bigger hammer.
   ACE_OS::sprintf (thr_string, "%lu",
                    (unsigned long) thread_handle_);
 #endif /* ACE_WIN32 */
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 5ee6b331b15..f7593d93be7 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -3086,13 +3086,13 @@ ACE_OS::thr_id (char buffer[], size_t buffer_length)
 #if defined (ACE_HAS_SNPRINTF)
   return ACE_OS::snprintf (buffer,
                            buffer_length,
-                           "u",
-                           static_cast <unsigned> (ACE_Thread::self ()));
+                           "%u",
+                           static_cast <unsigned> (ACE_OS::thr_self ()));
 #else
   ACE_UNUSED_ARG (buffer_length);
   return ACE_OS::sprintf (buffer,
-                          "u",
-                          static_cast <unsigned> (ACE_Thread::self ()));
+                          "%u",
+                          static_cast <unsigned> (ACE_OS::thr_self ()));
 #endif /* ACE_HAS_SNPRINTF */
 #else
   ACE_hthread_t t_id;
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 38ff9e88a6f..b88d2871867 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -5,5 +5,5 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 1
-#define ACE_BETA_VERSION 8
-#define ACE_VERSION "6.1.8"
+#define ACE_BETA_VERSION 9
+#define ACE_VERSION "6.1.9"
diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
index 4087013eec1..caf064e809f 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -3,7 +3,7 @@
 
 if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi
 if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi
-if test -z $3; then olddate=2013_03_14; else olddate=$3; fi
+if test -z $3; then olddate=2013_05_13; else olddate=$3; fi
 if test -z $ACE_ROOT; then ACE_ROOT=..; fi
 if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi
 if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi
diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc
index 99501edf5ea..0cd8f888ce1 100644
--- a/ACE/debian/ace.dsc
+++ b/ACE/debian/ace.dsc
@@ -1,10 +1,10 @@
 Format: 1.0
-Source: ACE+TAO+CIAO-src-6.1.8
-Version: 2.1.8
+Source: ACE+TAO+CIAO-src-6.1.9
+Version: 2.1.9
 Binary: ace
 Maintainer: Johnny Willemsen  <jwillemsen@remedy.nl>
 Architecture: any
-Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev
+Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz
 Files:
- e32db91fd4f3ca1e9cd07d77afb9d8d2 45290746 ACE+TAO+CIAO-src-6.1.8.tar.gz
+ 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.1.9.tar.gz
 
diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog
index fc255bb7d0a..a5915950023 100644
--- a/ACE/debian/debian.changelog
+++ b/ACE/debian/debian.changelog
@@ -1,3 +1,9 @@
+ace (6.1.9-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Johnny Willemsen <jwillemsen@remedy.nl>  Mon, 13 May 2013 19:01:01 +0200
+
 ace (6.1.8-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control
index e72113e0e7d..8f6d15068d8 100644
--- a/ACE/debian/debian.control
+++ b/ACE/debian/debian.control
@@ -28,7 +28,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.1.8
+Package: libace-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -46,7 +46,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.1.8 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.1.9 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, libtao-dev, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -63,7 +63,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.1.8
+Package: libace-ssl-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -74,12 +74,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends}
+Depends: libace-ssl-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.1.8
+Package: libace-rmcast-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -93,12 +93,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.1.8
+Package: libace-tmcast-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -112,12 +112,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.1.8
+Package: libace-htbp-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -131,12 +131,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.1.8
+Package: libace-inet-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -147,15 +147,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.1.8
+Package: libace-inet-ssl-6.1.9
 Architecture: any
 Section: libs
-Depends: libace-inet-6.1.8, libace-ssl-6.1.8, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.1.9, libace-ssl-6.1.9, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -164,7 +164,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.1.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.1.9 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -191,7 +191,7 @@ Description: ACE perfect hash function generator (transitional package)
  .
  It can be safely removed after installation.
 
-Package: libacexml-6.1.8
+Package: libacexml-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -207,16 +207,16 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libkokyu-6.1.8
+Package: libkokyu-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libtao-2.1.8, libtao-orbsvcs-2.1.8
+Suggests: libtao-2.1.8, libtao-orbsvcs-2.1.9
 Description: ACE scheduling and dispatching library
  Kokyu is a library designed to provide flexible scheduling and
  dispatching services.
@@ -227,12 +227,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-qtreactor-6.1.8
+Package: libace-qtreactor-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -251,12 +251,12 @@ Description: ACE-GUI reactor integration for Qt
 Package: libace-qtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-qtreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
+Depends: libace-qtreactor-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for Qt - development files
  This package contains header files and static library for the ACE-Qt
  reactor integration.
 
-Package: libace-xtreactor-6.1.8
+Package: libace-xtreactor-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -274,12 +274,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.7), ${misc:Depends}
+Depends: libace-xtreactor-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.7), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.1.8
+Package: libace-tkreactor-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -298,12 +298,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.1.8
+Package: libace-flreactor-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -321,12 +321,12 @@ Description: ACE-GUI reactor integration for Fl
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.8), ${misc:Depends}
+Depends: libace-flreactor-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.9), ${misc:Depends}
 Description: ACE-GUI reactor integration for Fl - development files
  This package contains header files and static library for the ACE-Fl
  reactor integration.
 
-Package: libace-foxreactor-6.1.8
+Package: libace-foxreactor-6.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -343,12 +343,12 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
 
-Package: libtao-2.1.8
+Package: libtao-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -363,7 +363,7 @@ Package: libtao-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-orbsvcs-dev (<< 5.7.7-4)
-Depends: libtao-2.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-2.1.9 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Suggests: libtao-doc, libtao-orbsvcs-dev
 Description: ACE based CORBA ORB core libraries - development files
  This package contains the header files for TAO. Due to the size of
@@ -379,7 +379,7 @@ Description: ACE based CORBA ORB core libraries - documentation
  This package contains the TAO overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libtao-orbsvcs-2.1.8
+Package: libtao-orbsvcs-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -390,14 +390,14 @@ Package: libtao-orbsvcs-dev
 Architecture: any
 Section: libdevel
 Replaces: libtao-dev (<< 5.7.7-4)
-Depends: libtao-orbsvcs-2.1.8 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-orbsvcs-2.1.9 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO CORBA services - development files
  This package contains the header files for the TAO CORBA services.
  .
  The examples and some documentation have been included as well, but the
  static libraries have been left out due to their size (over 400MB).
 
-Package: libtao-qtresource-2.1.8
+Package: libtao-qtresource-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -408,12 +408,12 @@ Description: TAO-GUI reactor integration for Qt
 Package: libtao-qtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-qtresource-2.1.8 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-qtresource-2.1.9 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Qt - development files
  This package contains header files and static library for the TAO-Qt
  reactor integration.
 
-Package: libtao-xtresource-2.1.8
+Package: libtao-xtresource-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -424,12 +424,12 @@ Description: TAO-GUI reactor integration for Xt
 Package: libtao-xtresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-xtresource-2.1.8 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-xtresource-2.1.9 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Xt - development files
  This package contains header files and static library for the TAO-Xt
  reactor integration.
 
-Package: libtao-flresource-2.1.8
+Package: libtao-flresource-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -440,12 +440,12 @@ Description: TAO-GUI reactor integration for Fl
 Package: libtao-flresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-flresource-2.1.8 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-flresource-2.1.9 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Fl - development files
  This package contains header files and static library for the TAO-Fl
  reactor integration.
 
-Package: libtao-tkresource-2.1.8
+Package: libtao-tkresource-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -456,12 +456,12 @@ Description: TAO-GUI reactor integration for Tk
 Package: libtao-tkresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-tkresource-2.1.8 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-tkresource-2.1.9 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for Tk - development files
  This package contains header files and static library for the TAO-Tk
  reactor integration.
 
-Package: libtao-foxresource-2.1.8
+Package: libtao-foxresource-2.1.9
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -472,14 +472,14 @@ Description: TAO-GUI reactor integration for FOX
 Package: libtao-foxresource-dev
 Architecture: any
 Section: libdevel
-Depends: libtao-foxresource-2.1.8 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libtao-foxresource-2.1.9 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends}
 Description: TAO-GUI reactor integration for FOX - development files
  This package contains header files and static library for the TAO-FOX
  reactor integration.
 
 Package: tao-idl
 Architecture: any
-Depends: g++, libtao-2.1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.1.9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO IDL to C++ compiler
  This package provides an Interface Definition Language (IDL) to C++
  compiler.
@@ -489,7 +489,7 @@ Description: TAO IDL to C++ compiler
 
 Package: tao-ifr
 Architecture: any
-Depends: g++, libtao-2.1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: g++, libtao-2.1.9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: TAO interface repository
  CORBA-aware programs can contact an interface repository to get
  objects' interfaces at run-time. Then they can use the Dynamic
diff --git a/ACE/debian/libace-6.1.8.docs b/ACE/debian/libace-6.1.9.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.1.8.docs
+++ b/ACE/debian/libace-6.1.9.docs
diff --git a/ACE/debian/libace-6.1.8.install b/ACE/debian/libace-6.1.9.install
index d9afda38c12..d9afda38c12 100644
--- a/ACE/debian/libace-6.1.8.install
+++ b/ACE/debian/libace-6.1.9.install
diff --git a/ACE/debian/libace-flreactor-6.1.8.install b/ACE/debian/libace-flreactor-6.1.9.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.1.8.install
+++ b/ACE/debian/libace-flreactor-6.1.9.install
diff --git a/ACE/debian/libace-foxreactor-6.1.8.install b/ACE/debian/libace-foxreactor-6.1.9.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.1.8.install
+++ b/ACE/debian/libace-foxreactor-6.1.9.install
diff --git a/ACE/debian/libace-htbp-6.1.8.install b/ACE/debian/libace-htbp-6.1.9.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.1.8.install
+++ b/ACE/debian/libace-htbp-6.1.9.install
diff --git a/ACE/debian/libace-inet-6.1.8.install b/ACE/debian/libace-inet-6.1.9.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.1.8.install
+++ b/ACE/debian/libace-inet-6.1.9.install
diff --git a/ACE/debian/libace-inet-ssl-6.1.8.install b/ACE/debian/libace-inet-ssl-6.1.9.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.1.8.install
+++ b/ACE/debian/libace-inet-ssl-6.1.9.install
diff --git a/ACE/debian/libace-qtreactor-6.1.8.install b/ACE/debian/libace-qtreactor-6.1.9.install
index 1d371e1e571..1d371e1e571 100644
--- a/ACE/debian/libace-qtreactor-6.1.8.install
+++ b/ACE/debian/libace-qtreactor-6.1.9.install
diff --git a/ACE/debian/libace-rmcast-6.1.8.install b/ACE/debian/libace-rmcast-6.1.9.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.1.8.install
+++ b/ACE/debian/libace-rmcast-6.1.9.install
diff --git a/ACE/debian/libace-ssl-6.1.8.NEWS b/ACE/debian/libace-ssl-6.1.9.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.1.8.NEWS
+++ b/ACE/debian/libace-ssl-6.1.9.NEWS
diff --git a/ACE/debian/libace-ssl-6.1.8.install b/ACE/debian/libace-ssl-6.1.9.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.1.8.install
+++ b/ACE/debian/libace-ssl-6.1.9.install
diff --git a/ACE/debian/libace-tkreactor-6.1.8.install b/ACE/debian/libace-tkreactor-6.1.9.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.1.8.install
+++ b/ACE/debian/libace-tkreactor-6.1.9.install
diff --git a/ACE/debian/libace-tmcast-6.1.8.install b/ACE/debian/libace-tmcast-6.1.9.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.1.8.install
+++ b/ACE/debian/libace-tmcast-6.1.9.install
diff --git a/ACE/debian/libace-xml-utils-6.1.8.install b/ACE/debian/libace-xml-utils-6.1.9.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.1.8.install
+++ b/ACE/debian/libace-xml-utils-6.1.9.install
diff --git a/ACE/debian/libace-xtreactor-6.1.8.install b/ACE/debian/libace-xtreactor-6.1.9.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.1.8.install
+++ b/ACE/debian/libace-xtreactor-6.1.9.install
diff --git a/ACE/debian/libacexml-6.1.8.docs b/ACE/debian/libacexml-6.1.9.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.1.8.docs
+++ b/ACE/debian/libacexml-6.1.9.docs
diff --git a/ACE/debian/libacexml-6.1.8.install b/ACE/debian/libacexml-6.1.9.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.1.8.install
+++ b/ACE/debian/libacexml-6.1.9.install
diff --git a/ACE/debian/libkokyu-6.1.8.docs b/ACE/debian/libkokyu-6.1.9.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.1.8.docs
+++ b/ACE/debian/libkokyu-6.1.9.docs
diff --git a/ACE/debian/libkokyu-6.1.8.install b/ACE/debian/libkokyu-6.1.9.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.1.8.install
+++ b/ACE/debian/libkokyu-6.1.9.install
diff --git a/ACE/debian/libtao-2.1.8.docs b/ACE/debian/libtao-2.1.9.docs
index 803353aba72..803353aba72 100644
--- a/ACE/debian/libtao-2.1.8.docs
+++ b/ACE/debian/libtao-2.1.9.docs
diff --git a/ACE/debian/libtao-2.1.8.install b/ACE/debian/libtao-2.1.9.install
index a80041c6986..a80041c6986 100644
--- a/ACE/debian/libtao-2.1.8.install
+++ b/ACE/debian/libtao-2.1.9.install
diff --git a/ACE/debian/libtao-flresource-2.1.8.install b/ACE/debian/libtao-flresource-2.1.9.install
index 5d4ee6ce57a..5d4ee6ce57a 100644
--- a/ACE/debian/libtao-flresource-2.1.8.install
+++ b/ACE/debian/libtao-flresource-2.1.9.install
diff --git a/ACE/debian/libtao-foxresource-2.1.8.install b/ACE/debian/libtao-foxresource-2.1.9.install
index 6ceb47601aa..6ceb47601aa 100644
--- a/ACE/debian/libtao-foxresource-2.1.8.install
+++ b/ACE/debian/libtao-foxresource-2.1.9.install
diff --git a/ACE/debian/libtao-orbsvcs-2.1.8.NEWS b/ACE/debian/libtao-orbsvcs-2.1.9.NEWS
index ea0759e0ade..ea0759e0ade 100644
--- a/ACE/debian/libtao-orbsvcs-2.1.8.NEWS
+++ b/ACE/debian/libtao-orbsvcs-2.1.9.NEWS
diff --git a/ACE/debian/libtao-orbsvcs-2.1.8.install b/ACE/debian/libtao-orbsvcs-2.1.9.install
index e0e491e9095..e0e491e9095 100644
--- a/ACE/debian/libtao-orbsvcs-2.1.8.install
+++ b/ACE/debian/libtao-orbsvcs-2.1.9.install
diff --git a/ACE/debian/libtao-qtresource-2.1.8.install b/ACE/debian/libtao-qtresource-2.1.9.install
index 172f4c45db8..172f4c45db8 100644
--- a/ACE/debian/libtao-qtresource-2.1.8.install
+++ b/ACE/debian/libtao-qtresource-2.1.9.install
diff --git a/ACE/debian/libtao-tkresource-2.1.8.install b/ACE/debian/libtao-tkresource-2.1.9.install
index 7f543154b5b..7f543154b5b 100644
--- a/ACE/debian/libtao-tkresource-2.1.8.install
+++ b/ACE/debian/libtao-tkresource-2.1.9.install
diff --git a/ACE/debian/libtao-xtresource-2.1.8.install b/ACE/debian/libtao-xtresource-2.1.9.install
index ab5151ed073..ab5151ed073 100644
--- a/ACE/debian/libtao-xtresource-2.1.8.install
+++ b/ACE/debian/libtao-xtresource-2.1.9.install
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 7fcc2fe4b94..7e5678e27d4 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -101,128 +101,128 @@ of the ACE, TAO, and CIAO micro release kit is available for
   <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR>
   <TR><TD>ACE+TAO+CIAO.tar.gz</TD>
       <TD>ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.tar.bz2</TD>
       <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+CIAO.zip</TD>
       <TD>ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+DAnCE.tar.gz</TD>
       <TD>ACE+TAO+DAnCE (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+DAnCE.tar.bz2</TD>
       <TD>ACE+TAO+DAnCE (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO+DAnCE.zip</TD>
       <TD>ACE+TAO+DAnCE (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.gz</TD>
       <TD>ACE+TAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.tar.bz2</TD>
       <TD>ACE+TAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE+TAO.zip</TD>
       <TD>ACE+TAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.gz</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.tar.bz2</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE-html.zip</TD>
       <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.9.zip">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.gz</TD>
       <TD>ACE only (tar+gzip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.gz">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.tar.bz2</TD>
       <TD>ACE only (tar+bzip2 format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.tar.bz2">FTP</A>]
       </TD>
   </TR>
   <TR><TD>ACE.zip</TD>
       <TD>ACE only (zip format)</TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.9.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.9.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index eff7e8e7983..6c08cd7b481 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -316,10 +316,10 @@
         mkdir doxygen<br>
         cd doxygen<br>
         wget https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/svn/config?view=co -O $HOME/.subversion/config<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/ACE ACE_wrappers<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/TAO ACE_wrappers/TAO<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/CIAO ACE_wrappers/TAO/CIAO<br>
-        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/DAnCE ACE_wrappers/TAO/DAnCE<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/ACE ACE_wrappers<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/TAO ACE_wrappers/TAO<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/CIAO ACE_wrappers/TAO/CIAO<br>
+        svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_9/DAnCE ACE_wrappers/TAO/DAnCE<br>
         cd ACE_wrappers<br>
         export ACE_ROOT=$PWD<br>
         export TAO_ROOT=$ACE_ROOT/TAO<br>
@@ -485,10 +485,7 @@
       </li>
       <li>Compile once on Win32, Linux and Solaris before cutting a beta.</li>
       <li>Trust the release script when making a release. Don't make tar balls by
-      hand. Make sure that the public ftp directories
-      (/project/beguine/ftp/pub/ACE+TAO-distribution and
-      /project/beguine/ftp/pub/ACE+TAO-distribution/diffs) have the right
-      permissions, so that the release script can copy the tar balls.</li>
+      hand.</li>
       <li>When all hell breaks loose, don't wait for the nightly builds to monitor
       improvement. Instead manually start the builds.</li>
       <li>Maintain private up-to-date workspaces for problem platforms (read as
@@ -501,7 +498,7 @@
       <li>Install your public key to the different machines you have frequent access
       to avoid typing password.</li>
       <li>Update this page if you have any more tips for future build czars :-). This
-      page is in svn under <code>ACE_wrappers/docs/bczar/bczar.html</code></li>
+      page is in git under <code>ACE/docs/bczar/bczar.html</code></li>
     </p></ol>
     <hr>
     <Center>
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 6aec7cfc267..d002d6655ac 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -35,6 +35,7 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
+      <LI><P><A HREF="6.1.9/html">6.1.9</A></P></LI>
       <LI><P><A HREF="6.1.8/html">6.1.8</A></P></LI>
       <LI><P><A HREF="6.1.7/html">6.1.7</A></P></LI>
       <LI><P><A HREF="6.1.6/html">6.1.6</A></P></LI>
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index cae69fc084b..32f4a54264b 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -198,7 +198,7 @@ void AIO_CLD_Acceptor::close (void) {
   ACE_Unbounded_Set_Iterator<AIO_Input_Handler *>
     iter (clients_.begin ());
   AIO_Input_Handler **ih;
-  while (iter.next (ih))
+  for (; iter.next (ih); ++iter)
     delete *ih;
 }
 
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index c920af69729..c6e3b2664a9 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  6.1.8
-%define TAOVER  2.1.8
-%define CIAOVER 1.1.8
+%define ACEVER  6.1.9
+%define TAOVER  2.1.9
+%define CIAOVER 1.1.9
 
 # Conditional build
 # Default values are
diff --git a/ACE/tests/Collection_Test.cpp b/ACE/tests/Collection_Test.cpp
index 253ec6a07fb..abc97634323 100644
--- a/ACE/tests/Collection_Test.cpp
+++ b/ACE/tests/Collection_Test.cpp
@@ -13,11 +13,8 @@
  */
 //=============================================================================
 
-
 #include "test_config.h"
 
-
-
 #include "ace/Containers.h"
 #include "Collection_Test.h"
 
diff --git a/ACE/tests/Compiler_Features_17_Test.cpp b/ACE/tests/Compiler_Features_17_Test.cpp
index 2991dc78a82..37461e486c1 100644
--- a/ACE/tests/Compiler_Features_17_Test.cpp
+++ b/ACE/tests/Compiler_Features_17_Test.cpp
@@ -11,6 +11,11 @@
 #include <limits>
 #include <stdint.h>
 
+constexpr int get_five()
+{
+  return 5;
+}
+
 class A
 {
 public:
diff --git a/ACE/tests/Thread_Manager_Test.cpp b/ACE/tests/Thread_Manager_Test.cpp
index 68adabbc3d8..b7f3b8b4d7f 100644
--- a/ACE/tests/Thread_Manager_Test.cpp
+++ b/ACE/tests/Thread_Manager_Test.cpp
@@ -10,12 +10,10 @@
  *    group suspension and resumption, and cooperative thread
  *    cancellation mechanisms.
  *
- *
  *  @author Prashant Jain <pjain@cs.wustl.edu> and Douglas C. Schmidt <schmidt@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #include "test_config.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Signal.h"
@@ -23,8 +21,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_time.h"
 
-
-
 #if defined (ACE_HAS_THREADS)
 #include "ace/Barrier.h"
 
@@ -85,12 +81,6 @@ handler (int /* signum */)
 static void *
 worker (int iterations)
 {
-#if 0
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) %s: stack size is %u\n"),
-              ACE_OS::thr_self (),
-              ACE_OS::thr_min_stack ()));
-#endif /* ACE_HAS_VXTHREADS */
-
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
   // Cache this thread's ID.
   const ACE_thread_t t_id = ACE_OS::thr_self ();
@@ -118,9 +108,13 @@ worker (int iterations)
               // to avoid race conditions for suspend() and resume().
               if (thr_mgr->testcancel (ACE_Thread::self ()) != 0)
                 {
+                  char thr_id[BUFSIZ];
+                  // Test out the ACE_OS::thr_id() method.
+                  ACE_OS::thr_id (thr_id, sizeof thr_id);
                   ACE_DEBUG ((LM_DEBUG,
-                              ACE_TEXT ("(%t) has been cancelled ")
+                              ACE_TEXT ("(%C) has been cancelled ")
                               ACE_TEXT ("before iteration %d!\n"),
+                              thr_id,
                               i));
                   break;
                 }
@@ -130,9 +124,9 @@ worker (int iterations)
             {
               char thr_id[BUFSIZ];
               // Test out the ACE_OS::thr_id() method.
-              ssize_t len = ACE_OS::thr_id (thr_id, sizeof thr_id);
+              ACE_OS::thr_id (thr_id, sizeof thr_id);
               ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%s) has been cancelled ")
+                          ACE_TEXT ("(%C) has been cancelled ")
                           ACE_TEXT ("before iteration %d!\n"),
                           thr_id,
                           i));
diff --git a/ACE/tests/Unbounded_Set_Test.cpp b/ACE/tests/Unbounded_Set_Test.cpp
index 960a4dd0ef5..cb2c494262f 100644
--- a/ACE/tests/Unbounded_Set_Test.cpp
+++ b/ACE/tests/Unbounded_Set_Test.cpp
@@ -8,7 +8,6 @@
  *    This test illustrates the use of ACE_Unbounded_Set.
  *    No command line arguments are needed to run the test.
  *
- *
  *  @author Rudolf Weber <rfweber@tesionmail.de>
  *  @author ace/tests integration <Oliver.Kellogg@sysde.eads.net>
  */
@@ -213,6 +212,20 @@ run_main (int, ACE_TCHAR *[])
       retval = -1;
     }
 
+  // Test iterating through a set and deleting elements.
+  {
+    ACE_Unbounded_Set<MyNode*> ubs3;
+    MyNode *n = 0;
+    for (int i = 0; i < 10; ++i)
+      {
+        n = new MyNode (i);
+        ubs3.insert (n);
+      }
+    MyNode **i_n = 0;
+    ACE_Unbounded_Set_Iterator<MyNode*> ubs3_iter (ubs3.begin ());
+    for (; ubs3_iter.next (i_n); ++ubs3_iter)
+      delete *i_n;
+  }
   ACE_END_TEST;
   return retval;
 }