diff options
| author | Simon McQueen <simon.mcqueen@gmail.com> | 2005-09-30 11:31:11 +0000 |
|---|---|---|
| committer | Simon McQueen <simon.mcqueen@gmail.com> | 2005-09-30 11:31:11 +0000 |
| commit | 6cee2925d1d46a5b4c2da5425f02169661ffad34 (patch) | |
| tree | ff0cdacedaa44fb3c28f709b981681441536c33f | |
| parent | b17459cb2581ba7c18d8a9ad5d61c2dc9aec23b9 (diff) | |
| download | ATCD-6cee2925d1d46a5b4c2da5425f02169661ffad34.tar.gz | |
ChangeLogTag: Fri Sep 30 12:22:51 2005 Simon McQueen <sm@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc | 4 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0d00986e4c3..04620652b7e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,7 @@ +Fri Sep 30 12:22:51 2005 Simon McQueen <sm@prismtech.com> + + * + Fri Sep 30 10:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Invocation_Base.{h,cpp}: diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc index 83c4e7e38d0..da13ee60363 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*server): portableserver, orbsvcsexe, iormanip, messaging { +project(*server): portableserver, orbsvcsexe, iormanip, messaging, minimum_corba { Source_Files { test_i.cpp server.cpp } } -project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb { +project(*Manager): portableserver, orbsvcsexe, iormanip, ftorb, minimum_corba { Source_Files { testC.cpp Manager.cpp diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 08e2def7121..a19ef18b814 100755 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -577,18 +577,18 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL) argv, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); CORBA::Object_var object = this->orb_->string_to_object (data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); // Combined IOR stuff Simple_Server_var server = Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (-1); if (CORBA::is_nil (server.in ())) { |