Changeset 10824

Timestamp:

05/25/11 16:27:17 (14 years ago)

Author:

tbretz

Message:

Handle operation_aborted in timeouts

Location:

trunk/FACT++/src

Files:

• fadctrl.cc (modified) (2 diffs)
• ftmctrl.cc (modified) (2 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -206 +206 @@
     void HandleReadTimeout(const bs::error_code &error)
     {
-        if (error && error!=ba::error::basic_errors::operation_aborted)
+        if (error==ba::error::basic_errors::operation_aborted)
+            return;
+
+        if (error)
         {
             ostringstream str;
@@ -223 +226 @@
             return;
         }
-
-        if (error==ba::error::basic_errors::operation_aborted)
-            return;
 
         // Check whether the deadline has passed. We compare the deadline

trunk/FACT++/src/ftmctrl.cc

@@ -402 +402 @@
     void HandleReadTimeout(const bs::error_code &error)
     {
-        if (error && error!=ba::error::basic_errors::operation_aborted)
+        if (error==ba::error::basic_errors::operation_aborted)
+            return;
+
+        if (error)
         {
             ostringstream str;
@@ -419 +422 @@
             return;
         }
-
-        if (error==ba::error::basic_errors::operation_aborted)
-            return;
 
         // Check whether the deadline has passed. We compare the deadline