Merge branch '2.1.x'

This commit is contained in:
Marcin Grzejszczak
2019-05-03 22:10:38 +04:00

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 {