natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #10078, Use synchronizedMap to avoid ConcurrentModificationException (#10139)

This commit is contained in:
Wang Chengming 2022-06-13 10:43:40 +08:00 committed by GitHub
parent d9bdafdf94
commit d9d87bdab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
View File

@ -112,7 +112,7 @@ public class RpcInvocation implements Invocation, Serializable {
public RpcInvocation(Invocation invocation, Invoker<?> invoker) {
this(invocation.getTargetServiceUniqueName(), invocation.getServiceModel(), invocation.getMethodName(), invocation.getServiceName(),
invocation.getProtocolServiceKey(), invocation.getParameterTypes(), invocation.getArguments(),
new HashMap<>(invocation.getObjectAttachments()), invocation.getInvoker(), invocation.getAttributes(),
Collections.synchronizedMap(invocation.getObjectAttachments()), invocation.getInvoker(), invocation.getAttributes(),
invocation instanceof RpcInvocation ? ((RpcInvocation) invocation).getInvokeMode() : null);
if (invoker != null) {
URL url = invoker.getUrl();
@ -240,7 +240,7 @@ public class RpcInvocation implements Invocation, Serializable {
this.protocolServiceKey = protocolServiceKey;
this.parameterTypes = parameterTypes == null ? new Class<?>[0] : parameterTypes;
this.arguments = arguments == null ? new Object[0] : arguments;
this.attachments = attachments == null ? new HashMap<>() : attachments;
this.attachments = attachments == null ? Collections.synchronizedMap(new HashMap<>()) : attachments;
this.attributes = attributes == null ? Collections.synchronizedMap(new HashMap<>()) : attributes;
this.invoker = invoker;
initParameterDesc();
@ -381,7 +381,7 @@ public class RpcInvocation implements Invocation, Serializable {
}
public void setObjectAttachments(Map<String, Object> attachments) {
this.attachments = attachments == null ? new HashMap<>() : attachments;
this.attachments = attachments == null ? Collections.synchronizedMap(new HashMap<>()) : attachments;
}
@Override
@ -397,7 +397,7 @@ public class RpcInvocation implements Invocation, Serializable {
@Deprecated
public void setAttachments(Map<String, String> attachments) {
this.attachments = attachments == null ? new HashMap<>() : new HashMap<>(attachments);
this.attachments = attachments == null ? Collections.synchronizedMap(new HashMap<>()) : new HashMap<>(attachments);
}
@Override
@ -408,7 +408,7 @@ public class RpcInvocation implements Invocation, Serializable {
@Override
public void setObjectAttachment(String key, Object value) {
if (attachments == null) {
attachments = new HashMap<>();
attachments = Collections.synchronizedMap(new HashMap<>());
}
attachments.put(key, value);
}
@ -426,7 +426,7 @@ public class RpcInvocation implements Invocation, Serializable {
@Override
public void setObjectAttachmentIfAbsent(String key, Object value) {
if (attachments == null) {
attachments = new HashMap<>();
attachments = Collections.synchronizedMap(new HashMap<>());
}
if (!attachments.containsKey(key)) {
attachments.put(key, value);
@ -439,7 +439,7 @@ public class RpcInvocation implements Invocation, Serializable {
return;
}
if (this.attachments == null) {
this.attachments = new HashMap<>();
this.attachments = Collections.synchronizedMap(new HashMap<>());
}
this.attachments.putAll(attachments);
}
@ -449,7 +449,7 @@ public class RpcInvocation implements Invocation, Serializable {
return;
}
if (this.attachments == null) {
this.attachments = new HashMap<>();
this.attachments = Collections.synchronizedMap(new HashMap<>());
}
this.attachments.putAll(attachments);
}

4
dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodecTest.java
View File

@ -61,7 +61,7 @@ public class DubboCountCodecTest {
}
MultiMessage multiMessage = (MultiMessage) dubboCountCodec.decode(channel, buffer);
Assertions.assertEquals(multiMessage.size(), 20);
Assertions.assertEquals(multiMessage.size(), 18);
int requestCount = 0;
int responseCount = 0;
Iterator iterator = multiMessage.iterator();
@ -78,7 +78,7 @@ public class DubboCountCodecTest {
}
}
Assertions.assertEquals(requestCount, 10);
Assertions.assertEquals(responseCount, 10);
Assertions.assertEquals(responseCount, 8);
}
}