diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 1997-05-22 19:14:21 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 1997-05-22 19:14:21 +0000 |
| commit | 0fa42bf8140020bd1624789543697c59c4822fd8 (patch) | |
| tree | 803d6cf35c40fd1df81ca54ea886bae250947b60 | |
| parent | 14bfdc68a1797bf2c19a083a4aad438731cb7aa5 (diff) | |
| download | ATCD-0fa42bf8140020bd1624789543697c59c4822fd8.tar.gz | |
* IIOP/lib/giop.cpp (start): Code now returns immediately when an
connection is not successfully made.
| -rw-r--r-- | TAO/ChangeLog-98c | 14 | ||||
| -rw-r--r-- | TAO/IIOP/lib/giop.cpp | 9 |
2 files changed, 16 insertions, 7 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 590d15f4688..9d031674674 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,9 +1,15 @@ +Thu May 22 14:12:16 1997 Chris Cleeland <cleeland@cs.wustl.edu> + + * IIOP/lib/giop.cpp (start): Code now returns immediately when an + connection is not successfully made. + Wed May 22 12:28:45 1997 Brian Mendel <bmendel@mdc.com> - * IIOP/test/clnt.cpp: Deleted VxWorks specific sections. Command - line is now working for VxWorks. - * IIOP/test/svr.cpp: Deleted VxWOrks specific sections. Command line - is now working for VxWorks. + * IIOP/test/clnt.cpp: Deleted VxWorks specific sections. Command + line is now working for VxWorks. + + * IIOP/test/svr.cpp: Deleted VxWOrks specific sections. Command + line is now working for VxWorks. Wed May 22 11:31:42 1997 Chris Cleeland <cleeland@cs.wustl.edu> diff --git a/TAO/IIOP/lib/giop.cpp b/TAO/IIOP/lib/giop.cpp index 3d37e3a19f0..3e3089c0751 100644 --- a/TAO/IIOP/lib/giop.cpp +++ b/TAO/IIOP/lib/giop.cpp @@ -188,7 +188,7 @@ GIOP::send_message (CDR &stream, if (writelen == -1) { - ACE_DEBUG ((LM_ERROR, "(%P|%t) OutgoingMessage::writebuf() $p\n")); + ACE_DEBUG ((LM_ERROR, "(%P|%t) OutgoingMessage::writebuf() %p\n")); ACE_DEBUG ((LM_DEBUG, "(%P|%t) closing conn %d after fault\n", connection)); ACE_OS::closesocket (connection); connection = ACE_INVALID_HANDLE; @@ -677,9 +677,12 @@ GIOP::Invocation::start (CORBA_Environment &env) // Establish the connection and get back a Client_Connection_Handler if (con->connect (handler_, server_addr) == -1) - // @@ Need to figure out which exception to set...this one is - // pretty vague. + { + // @@ Need to figure out which exception to set...this one is + // pretty vague. env.exception (new CORBA_COMM_FAILURE (COMPLETED_NO)); + return; + } // Use the ACE_SOCK_Stream from the Client_Connection_Handler for // communication inplace of the endpoint used below. |