This commit was manufactured by cvs2svn to create tagami_phase2_end

'ami_phase2_end'.

1 files changed, 4 insertions, 7 deletions

diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index e275942ea22..c1d4ab17e15 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -88,16 +88,13 @@ ACE_Token_Collection::acquire (int notify,
        iterator.advance ())
     {
       if (debug_)
-	ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("collection acquiring %s\n"),
+	ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("collection acquiring %s\n"),
 		    temp->int_id_->name ()));
-      if (temp->int_id_->acquire (notify,
-                                  sleep_hook,
-                                  options) == -1)
+      if (temp->int_id_->acquire (notify, sleep_hook, options) == -1)
 	{
-          // Save/restore errno.
-          ACE_Errno_Guard error (errno);
+	  int error = errno;
 	  this->release ();
+	  errno = error;
 	  ACE_RETURN (-1);
 	}
     }