diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-05-24 17:43:50 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-05-24 17:43:50 +0000 |
| commit | 0af28ca856e594161041e1980a88153eabd16793 (patch) | |
| tree | 91d4ee90e4e0f97ffd1113c983b9a7ac653477df | |
| parent | c50d3b39a2f36362b6cc6d20922cb7e6cb5fadec (diff) | |
| download | ATCD-0af28ca856e594161041e1980a88153eabd16793.tar.gz | |
ChangeLogTag:Wed
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/Remote_Tokens.cpp | 4 | ||||
| -rw-r--r-- | ace/Token_Request_Reply.inl | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 26f6bbfb7d6..2a17577c80a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed May 24 17:39:47 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Remote_Tokens.cpp (request_reply): Added a helpful error + message to make it easy to track down problems with TSS. + Wed May 24 17:22:31 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * configure.ac: diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp index fee4bb54869..1725993ae4c 100644 --- a/ace/Remote_Tokens.cpp +++ b/ace/Remote_Tokens.cpp @@ -157,7 +157,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); if (peer == 0) - return -1; + ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p\n", "BIG PROBLEMS with get_connection"), -1); // Transmit request via a blocking send. @@ -177,7 +177,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, errno = int (reply.errnum ()); if (errno != 0) - ACE_RETURN (-1); + return -1; else return 0; } diff --git a/ace/Token_Request_Reply.inl b/ace/Token_Request_Reply.inl index 34cfdd87f28..9955c4c66ea 100644 --- a/ace/Token_Request_Reply.inl +++ b/ace/Token_Request_Reply.inl @@ -104,7 +104,7 @@ ACE_Token_Request::options (const ACE_Synch_Options &opt) if (transfer_.use_timeout_ == 1) { transfer_.usec_ = options->timeout ().usec (); - if (options->timeout ().sec () > ACE_UINT32_MAX) + if (options->timeout ().sec () > (time_t) ACE_UINT32_MAX) transfer_.sec_ = ACE_UINT32_MAX; else transfer_.sec_ = static_cast<ACE_UINT32> (options->timeout ().sec ()); |