summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-11-06 12:55:35 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-11-06 12:55:35 +0000
commitbebfe52353a1cef0a2421ee3561420c056ef8514 (patch)
tree52ebb5566a388d978ecc7d5799611e71aedb6130
parent43ceb5a65a66ce3142e0d89e357216d09398bddb (diff)
downloadATCD-bebfe52353a1cef0a2421ee3561420c056ef8514.tar.gz
ChangeLogTag: Sat Nov 6 06:54:16 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog21
-rw-r--r--TAO/tao/DynamicInterface/DII_Arguments.cpp10
2 files changed, 20 insertions, 11 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 3192248fbde..5af69b0edbe 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,18 +1,25 @@
+Sat Nov 6 06:54:16 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * tao/DynamicInterface/DII_Arguments.cpp:
+
+ Changed ACE_TRY_NEW_ENV to ACE_DECLARE_NEW_CORBA_ENV and ACE_TRY.
+ The CORBA environment is used outside the scope of the try/catch.
+
Fri Nov 5 13:33:36 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
* TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-
- Added code generation for the override of the const
+
+ Added code generation for the override of the const
version of the _downcast() method for user exceptions.
Thanks to Simone Viani <sviani@etasistemi.it> for
reporting the missing generated method.
Fri Nov 5 10:51:08 2004 J.T. Conklin <jtc@acorntoolworks.com>
- * orbsvcs/orbsvcs/Makefile.am:
+ * orbsvcs/orbsvcs/Makefile.am:
- Updated for new location of HTBP library.
+ Updated for new location of HTBP library.
Fri Nov 5 11:50:39 2004 Chad Elliott <elliott_c@ociweb.com>
@@ -91,9 +98,9 @@ Thu Nov 4 17:42:07 2004 J.T. Conklin <jtc@acorntoolworks.com>
* orbsvcs/orbsvcs/Log/PersistStore.cpp:
Changed retrieve method to seek past records with non-matching
- id's. This avoids memory leaks and is more efficient than the
- code it replaced. Thanks to Gary Maxey <gary.maxey@hp.com> for
- reporting the problem.
+ id's. This avoids memory leaks and is more efficient than the
+ code it replaced. Thanks to Gary Maxey <gary.maxey@hp.com> for
+ reporting the problem.
Thu Nov 4 13:51:24 2004 J.T. Conklin <jtc@acorntoolworks.com>
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index f0a10a0dc39..18f9ca7e9d8 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -22,7 +22,8 @@ namespace TAO
CORBA::Boolean
NamedValue_Argument::demarshal (TAO_InputCDR &cdr)
{
- ACE_TRY_NEW_ENV
+ ACE_DECLARE_NEW_CORBA_ENV;
+ ACE_TRY
{
if (this->x_ !=0 && this->x_->value ()->impl ())
{
@@ -54,7 +55,8 @@ namespace TAO
CORBA::Boolean
NVList_Argument::marshal (TAO_OutputCDR &cdr)
{
- ACE_TRY_NEW_ENV
+ ACE_DECLARE_NEW_CORBA_ENV;
+ ACE_TRY
{
this->x_->_tao_encode (cdr,
CORBA::ARG_IN | CORBA::ARG_INOUT
@@ -75,8 +77,8 @@ namespace TAO
NVList_Argument::demarshal (TAO_InputCDR &cdr)
{
-
- ACE_TRY_NEW_ENV
+ ACE_DECLARE_NEW_CORBA_ENV;
+ ACE_TRY
{
// Now, get all the "return", "out", and "inout" parameters
// from the response message body ... return parameter is