diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-06 22:11:01 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-06-06 22:11:01 +0000 |
| commit | bfe500f9574044ca5ca98e296e4cd1f5c74511e7 (patch) | |
| tree | 862128e8f5362fe4e0cd1c000fbe5a1472b84071 | |
| parent | 2433d92a12994b9b25434beecb37e9147765819b (diff) | |
| download | ATCD-bfe500f9574044ca5ca98e296e4cd1f5c74511e7.tar.gz | |
ChangeLogTag:Sun Jun 6 17:08:57 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 5 | ||||
| -rw-r--r-- | TAO/tao/GIOP.cpp | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 5bbbb9e98a1..23460dbbb56 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,8 @@ +Sun Jun 6 17:08:57 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/GIOP.cpp: + More @@ comments addressed. + Sun Jun 6 16:14:50 1999 Jeff Parsons <parsons@cs.wustl.edu> * TAO/performance-tests/Pluggable/PP_Test_Client.h: diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp index fcaf8f5872f..8abe37cc107 100644 --- a/TAO/tao/GIOP.cpp +++ b/TAO/tao/GIOP.cpp @@ -496,9 +496,6 @@ TAO_GIOP::send_error (TAO_Transport *transport) ACE_HANDLE which = transport->handle (); - // @@ Carlos, can you please check to see if <send_n> should have - // it's reply checked? - // @@ Doug: I'm not sure what do you want me to do here... if (transport->send ((const u_char *)error_message, TAO_GIOP_HEADER_LEN) == -1) { @@ -597,7 +594,7 @@ TAO_GIOP::read_header (TAO_Transport *transport, // problems than just this small loop. char *buf = input.rd_ptr (); - size_t n; + ssize_t n; for (int t = header_size; t != 0; @@ -645,12 +642,13 @@ TAO_GIOP::handle_input (TAO_Transport *transport, if (input.grow (header_size + header.message_size) == -1) - // @@ Carlos, shouldn't we only print out an error message if - // TAO_debug_level is > 0? - ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) - %p\n", - "TAO_GIOP::handle_input, ACE_CDR::grow"), - -1); + { + if (TAO_debug_level > 0) + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - %p\n", + "TAO_GIOP::handle_input, ACE_CDR::grow")); + return -1; + } // Growing the buffer may have reset the rd_ptr(), but we want // to leave it just after the GIOP header (that was parsed |