diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-08-28 12:37:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-08-28 12:37:30 +0000 |
| commit | b90fea831854870c2a5b3a5efbdcb558f97c6b1c (patch) | |
| tree | 053d187c1d0fe53d57be530bb0ef2ee653059400 | |
| parent | 41da28bc7148d02ff0c32ebb24c4fb0402c8ebec (diff) | |
| download | ATCD-b90fea831854870c2a5b3a5efbdcb558f97c6b1c.tar.gz | |
ChangeLogTag: Thu Aug 28 12:35:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5800998a999..a95e1ef00ec 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 28 12:37:21 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp: + Fixed unused variable warning and compile problem in emulated + exception build. + Wed Aug 27 21:45:59 2003 Ossama Othman <ossama@dre.vanderbilt.edu> * tests/Big_Oneways/Session.h: diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 4048c19581a..80e61c1e88b 100644 --- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -36,8 +36,6 @@ Gateway::run (int argc, char* argv[]) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { -// TAO_EC_Gateway_IIOP* gateway = 0; - // First parse our command line options if (this->parse_args(argc, argv) != 0) { @@ -113,7 +111,8 @@ Gateway::run (int argc, char* argv[]) TAO_EC_Gateway_IIOP gateway; - gateway.init(supplier_event_channel.in(), consumer_event_channel.in()); + gateway.init(supplier_event_channel.in(), consumer_event_channel.in() ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; PortableServer::ObjectId_var gateway_oid = poa->activate_object(&gateway ACE_ENV_ARG_PARAMETER); @@ -135,6 +134,13 @@ Gateway::run (int argc, char* argv[]) // or using another thread, this example is too simple for that. orb->run (); + consumer_event_channel->remove_observer (local_ec_obs_handle + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + poa->deactivate_object (gateway_oid.in () ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + // Destroy the POA poa->destroy (1, 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |