From 163773af6bff2c3fb0e21da59db2f873f40f7a3d Mon Sep 17 00:00:00 2001 From: Bo LIANG Date: Wed, 16 Apr 2014 16:05:08 +0800 Subject: [PATCH] combine two try-catch block into one, make it cleaner. --- .../src/main/java/us/codecraft/webmagic/Spider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 8af1338..4a7fbee 100644 --- a/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java +++ b/webmagic-core/src/main/java/us/codecraft/webmagic/Spider.java @@ -489,17 +489,17 @@ public class Spider implements Runnable, Task { } private void waitNewUrl() { + newUrlLock.lock(); try { - newUrlLock.lock(); //double check if (threadAlive.get() == 0 && exitWhenComplete) { return; } - try { - newUrlCondition.await(); - } catch (InterruptedException e) { - } - } finally { + newUrlCondition.await(); + } catch (InterruptedException e) { + logger.warn("waitNewUrl - interrupted, error {}", e); + } + finally { newUrlLock.unlock(); } }