This is an automated email from the ASF dual-hosted git repository.

chibenwa pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jspf.git

commit b5faba755e64a0c270666a62557e7490cd93b971
Author: Benoit TELLIER <[email protected]>
AuthorDate: Tue Nov 10 18:02:55 2026 +0100

    [FIX] StagedMultipleSPFExecutor, DNSServiceAsynchSimulator: keep the 
interrupt of a waiting worker
    
    The InterruptedException cleared the interrupt flag and the worker went on 
waiting:
    an interrupt now stops the worker, or the throttling of a caller, and stays 
set.
    
    Fixes https://github.com/linagora/james-jspf/issues/24
---
 .../jspf/executor/StagedMultipleSPFExecutor.java    | 21 +++++++++++++++++----
 .../james/jspf/impl/DNSServiceAsynchSimulator.java  |  7 +++++--
 .../StagedMultipleSPFExecutorIntegrationTest.java   | 10 ++++++++++
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git 
a/resolver/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
 
b/resolver/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
index bcb2dc7..8bfa696 100644
--- 
a/resolver/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
+++ 
b/resolver/src/main/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutor.java
@@ -43,7 +43,7 @@ public class StagedMultipleSPFExecutor implements 
SPFExecutor, Runnable {
     private static final Logger LOGGER = 
LoggerFactory.getLogger(StagedMultipleSPFExecutor.class);
     private static final String ATTRIBUTE_STAGED_EXECUTOR_CONTINUATION = 
"StagedMultipleSPFExecutor.continuation";
 
-    private static class ResponseQueueImpl extends LinkedList<IResponse> 
implements IResponseQueue {
+    static class ResponseQueueImpl extends LinkedList<IResponse> implements 
IResponseQueue {
 
         private static final long serialVersionUID = 5714025260393791651L;
         
@@ -63,8 +63,14 @@ public class StagedMultipleSPFExecutor implements 
SPFExecutor, Runnable {
         public synchronized IResponse removeResponse() {
             if ( (size() - waitingThreads <= 0) ) {
                 try { waitingThreads++; wait();}
-                catch (InterruptedException e)  {Thread.interrupted();}
-                waitingThreads--;
+                catch (InterruptedException e)  {
+                    // keep the interrupt for the caller, which stops on a 
null response
+                    Thread.currentThread().interrupt();
+                }
+                finally { waitingThreads--; }
+            }
+            if (isEmpty()) {
+                return null;
             }
             return (IResponse)removeFirst();        }
 
@@ -163,6 +169,9 @@ public class StagedMultipleSPFExecutor implements 
SPFExecutor, Runnable {
             try {
                 this.wait(100);
             } catch (InterruptedException e) {
+                // stop throttling and keep the interrupt for the caller
+                Thread.currentThread().interrupt();
+                break;
             }
         }
         int nextId = nextId();
@@ -182,7 +191,11 @@ public class StagedMultipleSPFExecutor implements 
SPFExecutor, Runnable {
         while (true) {
             
             IResponse resp = responseQueue.removeResponse();
-            
+            if (resp == null) {
+                // interrupted: stop the worker
+                return;
+            }
+
             Integer respId = (Integer)resp.getId();
             SPFSession session = sessions.remove(respId);
             FutureSPFResult result = results.remove(respId);
diff --git 
a/resolver/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java
 
b/resolver/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java
index fc078d1..ead606a 100644
--- 
a/resolver/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java
+++ 
b/resolver/src/main/java/org/apache/james/jspf/impl/DNSServiceAsynchSimulator.java
@@ -96,9 +96,12 @@ public class DNSServiceAsynchSimulator implements Runnable, 
DNSAsynchLookupServi
                     try {
                         waitingThreads++; queue.wait();
                     } catch (InterruptedException e) {
-                        Thread.interrupted();
+                        // interrupted: stop the worker
+                        Thread.currentThread().interrupt();
+                        return;
+                    } finally {
+                        waitingThreads--;
                     }
-                    waitingThreads--;
                 }
                 req = (Request) queue.removeFirst();
             }
diff --git 
a/resolver/src/test/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutorIntegrationTest.java
 
b/resolver/src/test/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutorIntegrationTest.java
index c6f927f..372d5b3 100644
--- 
a/resolver/src/test/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutorIntegrationTest.java
+++ 
b/resolver/src/test/java/org/apache/james/jspf/executor/StagedMultipleSPFExecutorIntegrationTest.java
@@ -20,6 +20,8 @@
 package org.apache.james.jspf.executor;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -135,6 +137,14 @@ public class StagedMultipleSPFExecutorIntegrationTest {
         assertEquals(SPFErrorConstants.PASS_CONV, spf.checkSPF("1.2.3.4", 
"[email protected]", "example.com").getResult());
     }
 
+    @Test(timeout = 10000)
+    public void anInterruptedWaitForAResponseShouldKeepTheInterrupt() {
+        Thread.currentThread().interrupt();
+
+        assertNull(new 
StagedMultipleSPFExecutor.ResponseQueueImpl().removeResponse());
+        assertTrue(Thread.interrupted());
+    }
+
     private void checkUnexpectedLookupError(boolean multiThread, String 
domain) {
         SPF spf = new SPF(DNS, new StagedMultipleSPFExecutor(new 
DNSServiceAsynchSimulator(DNS, multiThread)));
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to