diff options
| -rw-r--r-- | TAO/ChangeLog-98c | 9 | ||||
| -rw-r--r-- | TAO/IIOP/lib/giop.cpp | 5 | ||||
| -rw-r--r-- | TAO/IIOP/lib/roa.cpp | 8 |
3 files changed, 19 insertions, 3 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 474e1c75745..8542e492c8b 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,12 @@ +Sun Apr 13 00:01:56 1997 Chris Cleeland <cleeland@tango.cs.wustl.edu> + + * roa.cpp: Fix continuation condition in ROA_Handler::svc()'s loop + so that it doesn't stop after one iteration. Also added some + debug messages. + + * giop.cpp: Fixed some returns being called with no value. This + should have been caught in the previous round of changes. + Sat Apr 12 23:10:08 1997 Chris Cleeland <cleeland@cs.wustl.edu> * tcpoa.{hh,cpp}: TCP_OA::handle_message() now returns a value diff --git a/TAO/IIOP/lib/giop.cpp b/TAO/IIOP/lib/giop.cpp index 3a148d894a3..99ed2d62d23 100644 --- a/TAO/IIOP/lib/giop.cpp +++ b/TAO/IIOP/lib/giop.cpp @@ -145,8 +145,9 @@ CORBA_Boolean GIOP::send_message(CDR& stream, ACE_SOCK_Stream& peer) { int h = peer.get_handle(); - send_message(stream, h); + CORBA_Boolean r = send_message(stream, h); peer.set_handle(h); + return r; } CORBA_Boolean @@ -1283,7 +1284,7 @@ GIOP::incoming_message ( delete req.object_key.buffer; CORBA_string_free (req.operation); - return; + return retval; } } diff --git a/TAO/IIOP/lib/roa.cpp b/TAO/IIOP/lib/roa.cpp index 924c1870852..81be1337d7b 100644 --- a/TAO/IIOP/lib/roa.cpp +++ b/TAO/IIOP/lib/roa.cpp @@ -27,6 +27,10 @@ ROA_Handler::open(void*) { if (activate(ACE_ROA::threadFlags()) == -1) ACE_ERROR_RETURN ((LM_ERROR, "ROA_Handler unable to spawn a thread: %p\n", "spawn"), -1); + else + ACE_DEBUG ((LM_DEBUG, + "(%P|%t) threaded connection from client %s\n", + addr.get_host_name())); } else { @@ -53,8 +57,10 @@ ROA_Handler::svc() { int result = 0; - while ((result = handle_input()) > 0) + ACE_DEBUG ((LM_DEBUG, "(%P|%t) ROA_Handler::svc begin\n")); + while ((result = handle_input()) >= 0) ; + ACE_DEBUG ((LM_DEBUG, "(%P|%t) ROA_Handler::svc end\n")); return result; } |