Changeset 9363 for branches/OaaS/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs (modified) (2 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

@@ -82 +82 @@
 
     private void RunPolling() {
+      IsPolling = true;
       while (true) {
-        IsPolling = true;
         try {
           waitHandle = new AutoResetEvent(false);
@@ -92 +92 @@
             waitHandle.WaitOne(Interval);
           }
+
           waitHandle.Close();
+          IsPolling = false;
+          return;
         }
         catch (Exception e) {
           OnExceptionOccured(e);
-        } finally {
-          IsPolling = false;
+          if (!autoResumeOnException) {
+            waitHandle.Close();
+            IsPolling = false;
+            return;
+          }
         }
-        if (stopRequested) return;
-        if (!autoResumeOnException) return;
       }
     }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages