[Bigdata-commit] SF.net SVN: bigdata:[8070] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/resources/AsynchronousOverflowTask.java

[<tho...@us...>]

Revision: 8070
          http://sourceforge.net/p/bigdata/code/8070
Author:   thompsonbry
Date:     2014-04-07 12:31:32 +0000 (Mon, 07 Apr 2014)
Log Message:
-----------
Bug fix for interrupt handling for the asynchronous overflow task and the individual partition tasks in scale-out.

See #871 (interrupt handling code review).

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java	2014-04-07 12:14:07 UTC (rev 8069)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/resources/AsynchronousOverflowTask.java	2014-04-07 12:31:32 UTC (rev 8070)
@@ -2848,7 +2848,7 @@
     
     /**
      * Note: This task is interrupted by {@link OverflowManager#shutdownNow()}.
-     * Therefore is tests {@link Thread#isInterrupted()} and returns immediately
+     * Therefore it tests {@link Thread#isInterrupted()} and returns immediately
      * if it has been interrupted.
      * 
      * @return The return value is always null.
@@ -3374,7 +3374,10 @@
     static protected boolean isNormalShutdown(
             final ResourceManager resourceManager, final Throwable t) {
 
-        if(Thread.currentThread().isInterrupted()) return true;
+        if (Thread.interrupted()) {
+            // Note: interrupt status of thread was cleared.
+            return true;
+        }
         
         if (!resourceManager.isRunning()
                 || !resourceManager.getConcurrencyManager()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.