summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-11-30 21:42:51 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-11-30 21:42:51 +0000
commit9fad611bd788c79e54d1584591faf10820834786 (patch)
tree8ed875701110bd8fd1b3411435fb6fe56a471424
parent4e35083790c8b1465633966e7b894fbce3573d34 (diff)
downloadATCD-9fad611bd788c79e54d1584591faf10820834786.tar.gz
ChangeLogTag:Tue Nov 30 21:41:58 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/CIDLC/ServantSourceGenerator.cpp4
-rw-r--r--TAO/CIAO/ChangeLog6
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index 600688be7c4..5881b4111b3 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -871,10 +871,10 @@ namespace
os << "conn._retn ();" << endl;
os << "Components::Cookie_var retv;"
- << "ACE_NEW_RETURN (" << endl
+ << "ACE_NEW_THROW_EX (" << endl
<< "retv.out ()," << endl
<< "CIAO::Map_Key_Cookie (key)," << endl
- << "0);" << endl;
+ << "CORBA::NO_MEMORY ());" << endl;
os << "return retv._retn ();" << endl
<< "}";
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index ac920a5280b..7b0b3bcbe5c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 30 21:41:58 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * CIDLC/ServantSourceGenerator.cpp (namespace):
+
+ More use of ACE_NEW_THROW_EX instead of ACE_NEW_RETURN.
+
Tue Nov 30 21:03:00 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* CIDLC/ServantSourceGenerator.cpp (namespace):