From f745dd78a53accde632c41387c6881a5da609fdf Mon Sep 17 00:00:00 2001 From: Vivian Delannoy Date: Tue, 13 Apr 2021 22:34:36 +0200 Subject: [PATCH 1/2] exception if the waiting time detectably elapsed before return from the method --- .../src/main/java/us/codecraft/webmagic/Spider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java b/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java index 5940e738d..d3440b877 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java @@ -572,7 +572,10 @@ private void waitNewUrl() { if (threadPool.getThreadAlive() == 0 && exitWhenComplete) { return; } - newUrlCondition.await(emptySleepTime, TimeUnit.MILLISECONDS); + if(!newUrlCondition.await(emptySleepTime, TimeUnit.MILLISECONDS)){ + throw new InterruptedException("the waiting time detectably elapsed before return from a method"); + } + } catch (InterruptedException e) { logger.warn("waitNewUrl - interrupted, error {}", e); } finally { From 24742e8e9c5b188ca1146567c99c5e1938456a5b Mon Sep 17 00:00:00 2001 From: Vivian Delannoy Date: Tue, 13 Apr 2021 22:59:40 +0200 Subject: [PATCH 2/2] exception if the waiting time detectably elapsed before return from the method --- .../src/main/java/us/codecraft/webmagic/Spider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java b/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java index d3440b877..81c05083b 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java @@ -572,8 +572,9 @@ private void waitNewUrl() { if (threadPool.getThreadAlive() == 0 && exitWhenComplete) { return; } - if(!newUrlCondition.await(emptySleepTime, TimeUnit.MILLISECONDS)){ - throw new InterruptedException("the waiting time detectably elapsed before return from a method"); + + if( ! newUrlCondition.await(emptySleepTime, TimeUnit.MILLISECONDS) ){ + throw new InterruptedException(); } } catch (InterruptedException e) {