This commit was manufactured by cvs2svn to create tagami_phase2_end

'ami_phase2_end'.

1 files changed, 8 insertions, 12 deletions

diff --git a/ace/Remote_Tokens.cpp b/ace/Remote_Tokens.cpp
index 72881602d7d..928a9b98de3 100644
--- a/ace/Remote_Tokens.cpp
+++ b/ace/Remote_Tokens.cpp
@@ -257,10 +257,9 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *))
     {
       if (debug_)
 	{
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
-	  ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("shadow try acquire failed\n")));
+	  int error = errno;
+	  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("shadow try acquire failed\n")));
+	  errno = error;
 	}
 
       return -1;
@@ -308,14 +307,11 @@ ACE_Remote_Token_Proxy::renew (int requeue_position,
 
   if (result == -1)
     {
-      {
-        // Save/restore errno.
-        ACE_Errno_Guard error (errno);
-        ACE_Token_Proxy::release ();
-      }
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p error on remote renew, releasing shadow mutex.\n",
-                         "ACE_Remote_Token_Proxy"), -1);
+      int error = errno;
+      ACE_Token_Proxy::release ();
+      errno = error;
+      ACE_ERROR_RETURN ((LM_ERROR, "%p error on remote renew, releasing shadow mutex.\n",
+				   "ACE_Remote_Token_Proxy"), -1);
     }
   else
     {