SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Making a copy of "nativeHeaders" and working on a copy

Browse Source 
otherwise we got ConcurrentModificationExceptions

fixes gh-1345
This commit is contained in:
Marcin Grzejszczak
2019-05-03 22:08:09 +04:00
parent 42b3e4c6c8
commit 9533fbfed0
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/messaging/MessageHeaderPropagation.java
View File

@@ -151,11 +151,18 @@ enum MessageHeaderPropagation
nativeHeaders);
}
if (nativeHeaders instanceof Map<?, ?>) {
((Map) nativeHeaders).put(key, Collections.singletonList(value));
Map<String, List<String>> copy = toNativeHeaderMap(
(Map<String, List<String>>) nativeHeaders);
copy.put(key, Collections.singletonList(value));
accessor.setHeader(NativeMessageHeaderAccessor.NATIVE_HEADERS, copy);
}
}
}
private Map<String, List<String>> toNativeHeaderMap(Map<String, List<String>> map) {
return (map != null ? new LinkedMultiValueMap<>(map) : Collections.emptyMap());
}
@Override
public String get(MessageHeaderAccessor accessor, String key) {
try {