diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2007-02-20 18:54:43 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2007-02-20 18:54:43 +0000 |
commit | dcf856bcbacfdffcd43a52283368bacd27e49dd7 (patch) | |
tree | 0d98e450fbf1c5dd244442ac0c1784c78d748d1d | |
parent | be89b620f3be74ce7b7647cb387cce605640e521 (diff) | |
download | ATCD-dcf856bcbacfdffcd43a52283368bacd27e49dd7.tar.gz |
ChangeLogTag:<<<<<<<
-rw-r--r-- | TAO/COPYING | 30 | ||||
-rw-r--r-- | TAO/ChangeLog | 13 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 6 |
3 files changed, 34 insertions, 15 deletions
diff --git a/TAO/COPYING b/TAO/COPYING index 2a8822bc2a8..95a2a227c50 100644 --- a/TAO/COPYING +++ b/TAO/COPYING @@ -1,21 +1,21 @@ _________________________________________________________________ - + Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) - + [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt University, - Copyright (c) 1993-2007, all rights reserved. Since DOC software is + Copyright (c) 1993-2006, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as well as copy and distribute modified versions of this software. You must, however, - include this copyright statement along with code built using DOC - software. - + include this copyright statement along with any code built using DOC + software that you release. + You can use DOC software in commercial and/or binary software releases and are under no obligation to redistribute any of your source code that is built using DOC software. Note, however, that you may not do @@ -26,7 +26,7 @@ software in your software, though we encourage you to let [10]us know so we can promote your project in the [11]DOC software success stories. - + The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are maintained by the [16]DOC Group at the [17]Institute for Software Integrated Systems (ISIS) and the [18]Center for Distributed Object @@ -44,7 +44,7 @@ modification of such Submissions is entirely at the discretion of the moderators of the open-source DOC software projects or their designees. - + Submissions are provided by the submitter ``as is'' with no warranties whatsoever, including any warranty of merchantability, noninfringement of third party intellectual property, or fitness for any particular @@ -62,13 +62,13 @@ University, UC Irvine, or Vanderbilt University, their employees, or students be liable for any lost revenue or profits or other special, indirect and consequential damages. - + DOC software is provided with no support and without any obligation on the part of Washington University, UC Irvine, Vanderbilt University, their employees, or students to assist in its use, correction, modification, or enhancement. A [19]number of companies around the world provide commercial support for DOC software, however. - + DOC software is Y2K-compliant, as long as the underlying OS platform is Y2K-compliant. Likewise, DOC software is compliant with the new US daylight savings rule passed by Congress as "The Energy Policy Act of @@ -77,7 +77,7 @@ obtains time/date and calendaring information from operating systems users will not be affected by the new DST rules as long as they upgrade their operating systems accordingly. - + The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington University, UC Irvine, and Vanderbilt University, may not be used to endorse or promote products or services derived from this source @@ -88,13 +88,13 @@ Vanderbilt University appear in their names, without express written permission from Washington University, UC Irvine, and Vanderbilt University. - + If you have any suggestions, additions, comments, or questions, please let [20]me know. - + [21]Douglas C. Schmidt _________________________________________________________________ - + Back to the [22]ACE home page. References @@ -120,4 +120,4 @@ References 19. http://www.cs.wustl.edu/~schmidt/commercial-support.html 20. mailto:d.schmidt@vanderbilt.edu 21. http://www.dre.vanderbilt.edu/~schmidt/ - 22. http://www.cs.wustl.edu/~schmidt/ACE.html + 22. http://www.cs.wustl.edu/ACE.html diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f1ed6834e7d..59c7336a90d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Tue Feb 20 18:35:50 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (ssliop_connect): + Call remove_reference() on svc_handler so that we don't leak + handles. Thanks to Ken Sedgwick <ken+5a4 at bonsai dot com> for + reporting this and testing the fix. This fixes bugid 1506. + +Tue Feb 20 17:56:25 UTC 2007 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * COPYING: Clarified how the COPYING file need to be included with + any code released. Thanks to Scott Mark <sjm at pobox dot com> + for helping clarify this. + Tue Feb 20 16:03:13 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu> * tao/PortableServer/Default_Servant_Dispatcher.cpp: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 4f5e56ecfc7..63f4be3b1f3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -613,6 +613,12 @@ TAO::SSLIOP::Connector::ssliop_connect ( remote_address, synch_options); + // base_connector_.connect() will increment the handler's + // #REFCOUNT# once more. This is not required as we already hold + // a reference to the handler, so we discard this second + // reference. + svc_handler->remove_reference (); + // There are three possibilities from calling connect(): (a) // connection succeeds immediately - in this case, the // #REFCOUNT# on the handler is two; (b) connection completion |