diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-18 21:00:08 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-08-18 21:00:08 +0000 |
| commit | a2e27000b6545e6b410ca3960af80605df18fd7a (patch) | |
| tree | 2b7bfd433c7bf7672d89dd2822fb75c4211b197d /TAO | |
| parent | 99f3d1856db889db5f0287c23ce3ea39aaadf523 (diff) | |
| download | ATCD-a2e27000b6545e6b410ca3960af80605df18fd7a.tar.gz | |
ChangeLogTag: Thu Aug 18 13:59:52 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f4da629f8a2..c5a87f091f4 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 18 13:59:52 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/orbsvcs/Log/LogActivator.cpp: + + Fixed emulated exception build failures. + Thu Aug 18 13:46:38 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/orbsvcs/Log/LogActivator.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp index 303ee6d7d3c..c61096e9fed 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp @@ -28,10 +28,11 @@ TAO_LogActivator::incarnate (const PortableServer::ObjectId& oid, DsLogAdmin::LogId id = ACE_OS::strtoul(poa_id.in (), 0, 0); - if (!logmgr_i_.exists(id)) + if (!logmgr_i_.exists(id ACE_ENV_ARG_PARAMETER)) ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); + ACE_CHECK_RETURN(0); - return logmgr_i_.create_log_servant (id); + return logmgr_i_.create_log_servant (id ACE_ENV_ARG_PARAMETER); } |