diff options
| author | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-04 23:14:06 +0000 |
|---|---|---|
| committer | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-04-04 23:14:06 +0000 |
| commit | 1dfcd2d3797f2a0915274e703e3c707eead17175 (patch) | |
| tree | 2f152dd6d65b8826d30f9f6beb38397a28dd11ab | |
| parent | 271028cba775c88f96d2e01e108b2fa3cd58ee7b (diff) | |
| download | ATCD-1dfcd2d3797f2a0915274e703e3c707eead17175.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp | 1 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp index 391408b88c7..a79b29920d3 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.cpp @@ -157,6 +157,7 @@ Video_Control_i::set_peer (const char *peer, -1); VIDEO_SINGLETON::instance ()->videoSocket = VIDEO_SINGLETON::instance ()->dgram.get_handle (); + return server_data_addr.get_port_number (); } diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp index 0c8a0bf6a9c..68ad3b0e66d 100644 --- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.cpp @@ -291,8 +291,16 @@ Video_Server::initialize_orb (int argc, VIDEO_CONTROL_I::instance ()->_this (env), env); - TAO_CHECK_ENV_RETURN (env, - -1); + if (env.exception () != 0) + { + env.clear (); + naming_context->rebind (video_control_name, + VIDEO_CONTROL_I::instance ()->_this (env), + env); + TAO_CHECK_ENV_RETURN (env, + -1); + } + ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); VIDEO_CONTROL_I::instance ()->change_state (VIDEO_CONTROL_WAITING_STATE::instance ()); ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__)); |