Skip to content

Commit 4811ea8

Browse files
garyrussellartembilan
authored andcommitted
GH-686: Handle tombstones in Json Ser/Deser
Fixes #686 **Cherry-pick to 2.1.x, 2.0.x, 1.3.x** (cherry picked from commit 8dc1dcd) # Conflicts: # spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonDeserializer.java # spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonSerializer.java (cherry picked from commit 02d4a45)
1 parent 2472224 commit 4811ea8

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonDeserializer.java

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public void configure(Map<String, ?> configs, boolean isKey) {
7777
}
7878

7979
public T deserialize(String topic, byte[] data) {
80+
if (data == null) {
81+
return null;
82+
}
8083
if (this.reader == null) {
8184
this.reader = this.objectMapper.readerFor(this.targetType);
8285
}

spring-kafka/src/main/java/org/springframework/kafka/support/serializer/JsonSerializer.java

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ public void configure(Map<String, ?> configs, boolean isKey) {
5656
}
5757

5858
public byte[] serialize(String topic, T data) {
59+
if (data == null) {
60+
return null;
61+
}
5962
try {
6063
byte[] result = null;
6164
if (data != null) {

0 commit comments

Comments
 (0)