Skip to content

Commit 856b021

Browse files
binarywangbinarywang
committed
正确处理InterruptException
Sonar-2142: "InterruptedException" should not be ignored
1 parent 9ed9c2a commit 856b021

File tree

7 files changed

+60
-43
lines changed

7 files changed

+60
-43
lines changed

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxMessageInMemoryDuplicateChecker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void run() {
7676
}
7777
}
7878
} catch (InterruptedException e) {
79-
e.printStackTrace();
79+
Thread.currentThread().interrupt();
8080
}
8181
}
8282
});

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ public void run() {
196196
Thread.sleep(StandardSessionManager.this.backgroundProcessorDelay * 1000L);
197197
backgroundProcess();
198198
} catch (InterruptedException e) {
199+
Thread.currentThread().interrupt();
199200
StandardSessionManager.this.log.error("SessionManagerImpl.backgroundProcess error", e);
200201
}
201202
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package me.chanjar.weixin.common.util.http.apache;
22

3+
import java.io.IOException;
4+
import java.util.concurrent.TimeUnit;
5+
import java.util.concurrent.atomic.AtomicBoolean;
6+
37
import org.apache.commons.lang3.StringUtils;
48
import org.apache.http.HttpHost;
59
import org.apache.http.annotation.NotThreadSafe;
@@ -25,10 +29,6 @@
2529
import org.slf4j.Logger;
2630
import org.slf4j.LoggerFactory;
2731

28-
import java.io.IOException;
29-
import java.util.concurrent.TimeUnit;
30-
import java.util.concurrent.atomic.AtomicBoolean;
31-
3232
/**
3333
* httpclient 连接管理器 自带DNS解析.
3434
* <p>大部分代码拷贝自：DefaultApacheHttpClientBuilder</p>
@@ -292,6 +292,7 @@ public void run() {
292292
}
293293
}
294294
} catch (InterruptedException ignore) {
295+
Thread.currentThread().interrupt();
295296
}
296297
}
297298

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package me.chanjar.weixin.cp.api.impl;
22

3+
import java.io.File;
4+
import java.io.IOException;
5+
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
39
import com.google.gson.JsonArray;
410
import com.google.gson.JsonElement;
511
import com.google.gson.JsonObject;
@@ -17,14 +23,17 @@
1723
import me.chanjar.weixin.common.util.http.RequestHttp;
1824
import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
1925
import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
20-
import me.chanjar.weixin.cp.api.*;
21-
import me.chanjar.weixin.cp.bean.*;
26+
import me.chanjar.weixin.cp.api.WxCpAgentService;
27+
import me.chanjar.weixin.cp.api.WxCpDepartmentService;
28+
import me.chanjar.weixin.cp.api.WxCpMediaService;
29+
import me.chanjar.weixin.cp.api.WxCpMenuService;
30+
import me.chanjar.weixin.cp.api.WxCpOAuth2Service;
31+
import me.chanjar.weixin.cp.api.WxCpService;
32+
import me.chanjar.weixin.cp.api.WxCpTagService;
33+
import me.chanjar.weixin.cp.api.WxCpUserService;
34+
import me.chanjar.weixin.cp.bean.WxCpMessage;
35+
import me.chanjar.weixin.cp.bean.WxCpMessageSendResult;
2236
import me.chanjar.weixin.cp.config.WxCpConfigStorage;
23-
import org.slf4j.Logger;
24-
import org.slf4j.LoggerFactory;
25-
26-
import java.io.File;
27-
import java.io.IOException;
2837

2938
public abstract class WxCpServiceAbstractImpl<H, P> implements WxCpService, RequestHttp<H, P> {
3039
protected final Logger log = LoggerFactory.getLogger(this.getClass());
@@ -184,7 +193,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
184193
this.log.debug("微信系统繁忙，{} ms 后重试(第{}次)", sleepMillis, retryTimes + 1);
185194
Thread.sleep(sleepMillis);
186195
} catch (InterruptedException e1) {
187-
throw new RuntimeException(e1);
196+
Thread.currentThread().interrupt();
188197
}
189198
} else {
190199
throw e;

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouter.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
package me.chanjar.weixin.cp.message;
22

3+
import java.util.ArrayList;
4+
import java.util.HashMap;
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.concurrent.ExecutionException;
8+
import java.util.concurrent.ExecutorService;
9+
import java.util.concurrent.Executors;
10+
import java.util.concurrent.Future;
11+
12+
import org.apache.commons.lang3.StringUtils;
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
15+
316
import me.chanjar.weixin.common.api.WxErrorExceptionHandler;
417
import me.chanjar.weixin.common.api.WxMessageDuplicateChecker;
518
import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;
@@ -11,18 +24,6 @@
1124
import me.chanjar.weixin.cp.api.WxCpService;
1225
import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
1326
import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
14-
import org.apache.commons.lang3.StringUtils;
15-
import org.slf4j.Logger;
16-
import org.slf4j.LoggerFactory;
17-
18-
import java.util.ArrayList;
19-
import java.util.HashMap;
20-
import java.util.List;
21-
import java.util.Map;
22-
import java.util.concurrent.ExecutionException;
23-
import java.util.concurrent.ExecutorService;
24-
import java.util.concurrent.Executors;
25-
import java.util.concurrent.Future;
2627

2728
/**
2829
* <pre>
@@ -195,6 +196,7 @@ public void run() {
195196
sessionEndAccess(wxMessage);
196197
} catch (InterruptedException e) {
197198
WxCpMessageRouter.this.log.error("Error happened when wait task finish", e);
199+
Thread.currentThread().interrupt();
198200
} catch (ExecutionException e) {
199201
WxCpMessageRouter.this.log.error("Error happened when wait task finish", e);
200202
}
@@ -207,12 +209,11 @@ public void run() {
207209

208210

209211
/**
210-
* 处理微信消息
212+
* 处理微信消息.
211213
*
212-
* @param wxMessage
213214
*/
214215
public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
215-
return this.route(wxMessage, new HashMap<String, Object>());
216+
return this.route(wxMessage, new HashMap<String, Object>(2));
216217
}
217218

218219
protected boolean isDuplicateMessage(WxCpXmlMessage wxMessage) {

‎weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
212212
log.warn("微信系统繁忙，{} ms 后重试(第{}次)", sleepMillis, retryTimes + 1);
213213
Thread.sleep(sleepMillis);
214214
} catch (InterruptedException e1) {
215-
throw new RuntimeException(e1);
215+
Thread.currentThread().interrupt();
216216
}
217217
} else {
218218
throw e;

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java‎

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
package me.chanjar.weixin.mp.api;
22

3+
import java.util.ArrayList;
4+
import java.util.HashMap;
5+
import java.util.List;
6+
import java.util.Map;
7+
import java.util.concurrent.ExecutionException;
8+
import java.util.concurrent.ExecutorService;
9+
import java.util.concurrent.Executors;
10+
import java.util.concurrent.Future;
11+
12+
import org.apache.commons.lang3.StringUtils;
13+
import org.slf4j.Logger;
14+
import org.slf4j.LoggerFactory;
15+
316
import me.chanjar.weixin.common.api.WxErrorExceptionHandler;
417
import me.chanjar.weixin.common.api.WxMessageDuplicateChecker;
518
import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;
@@ -10,18 +23,6 @@
1023
import me.chanjar.weixin.common.util.LogExceptionHandler;
1124
import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
1225
import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
13-
import org.apache.commons.lang3.StringUtils;
14-
import org.slf4j.Logger;
15-
import org.slf4j.LoggerFactory;
16-
17-
import java.util.ArrayList;
18-
import java.util.HashMap;
19-
import java.util.List;
20-
import java.util.Map;
21-
import java.util.concurrent.ExecutionException;
22-
import java.util.concurrent.ExecutorService;
23-
import java.util.concurrent.Executors;
24-
import java.util.concurrent.Future;
2526

2627
/**
2728
* <pre>
@@ -155,11 +156,12 @@ public WxMpMessageRouterRule rule() {
155156
public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String, Object> context) {
156157
return route(wxMessage, context, null);
157158
}
159+
158160
/**
159161
* 处理微信消息
160162
*/
161163
public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String, Object> context, WxMpService wxMpService) {
162-
if(wxMpService == null){
164+
if (wxMpService == null) {
163165
wxMpService = this.wxMpService;
164166
}
165167
final WxMpService mpService = wxMpService;
@@ -214,7 +216,10 @@ public void run() {
214216
WxMpMessageRouter.this.log.debug("End session access: async=true, sessionId={}", wxMessage.getFromUser());
215217
// 异步操作结束，session访问结束
216218
sessionEndAccess(wxMessage);
217-
} catch (InterruptedException | ExecutionException e) {
219+
} catch (InterruptedException e) {
220+
WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
221+
Thread.currentThread().interrupt();
222+
} catch (ExecutionException e) {
218223
WxMpMessageRouter.this.log.error("Error happened when wait task finish", e);
219224
}
220225
}

0 commit comments

Comments
 (0)