crabapples
/
Sentinel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the bug of misplaced locks in ContextUtil and ClusterNode (#1429) 

- which may lead to IllegalMonitorStateException in unlock() when unchecked error occurs during lock()
This commit is contained in:
haifeng 2020-04-26 10:58:27 +08:00 committed by GitHub
parent cfea7ae338
commit 04a1d065dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sentinel-core/src/main/java/com/alibaba/csp/sentinel/context/ContextUtil.java
View File

@ -127,8 +127,8 @@ public class ContextUtil {
setNullContext(); setNullContext();
return NULL_CONTEXT; return NULL_CONTEXT;
} else { } else {
LOCK.lock();
try { try {
LOCK.lock();
node = contextNameNodeMap.get(name); node = contextNameNodeMap.get(name);
if (node == null) { if (node == null) {
if (contextNameNodeMap.size() > Constants.MAX_CONTEXT_NAME_SIZE) { if (contextNameNodeMap.size() > Constants.MAX_CONTEXT_NAME_SIZE) {

2
sentinel-core/src/main/java/com/alibaba/csp/sentinel/node/ClusterNode.java
View File

@ -101,8 +101,8 @@ public class ClusterNode extends StatisticNode {
public Node getOrCreateOriginNode(String origin) { public Node getOrCreateOriginNode(String origin) {
StatisticNode statisticNode = originCountMap.get(origin); StatisticNode statisticNode = originCountMap.get(origin);
if (statisticNode == null) { if (statisticNode == null) {
lock.lock();
try { try {
lock.lock();
statisticNode = originCountMap.get(origin); statisticNode = originCountMap.get(origin);
if (statisticNode == null) { if (statisticNode == null) {
// The node is absent, create a new node for the origin. // The node is absent, create a new node for the origin.