From 42c4c4cfda8aa9f8d69b463f93bd1bf048e1b319 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 19 Mar 2016 01:14:25 +0800 Subject: [PATCH] Ensure poll safe for some bad ROM --- .../main/java/com/hippo/ehviewer/spider/SpiderQueen.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java index b648c424c..1fd8ce66d 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java @@ -830,7 +830,11 @@ public class SpiderQueen implements Runnable { while (!Thread.currentThread().isInterrupted()) { Integer index; synchronized (mPTokenLock) { - index = mRequestPTokenQueue.poll(); + if (mRequestPTokenQueue.isEmpty()) { + index = null; + } else { + index = mRequestPTokenQueue.poll(); + } } if (index == null) {