root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Avoid NPE on comment SSE event 

Closes gh-24389
This commit is contained in:
Rossen Stoyanchev 2020-01-20 11:26:58 +00:00
parent c20a7b4636
commit 5d8c5b0d9b
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java
View File

@ -135,7 +135,10 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
return this.lineDecoder.decode(message.getBody(), STRING_TYPE, null, hints)
.doOnNext(limitTracker::afterLineParsed)
.bufferUntil(String::isEmpty)
.map(lines -> buildEvent(lines, valueType, shouldWrap, hints));
.concatMap(lines -> {
Object event = buildEvent(lines, valueType, shouldWrap, hints);
return (event != null ? Mono.just(event) : Mono.empty());
});
}
@Nullable
@ -168,7 +171,7 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
}
}
Object decodedData = data != null ? decodeData(data.toString(), valueType, hints) : null;
Object decodedData = (data != null ? decodeData(data.toString(), valueType, hints) : null);
if (shouldWrap) {
if (comment != null) {
@ -180,7 +183,7 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader<Objec
return sseBuilder.build();
}
else {
return decodedData;
return (decodedData);
}
}

11
spring-web/src/test/java/org/springframework/http/codec/ServerSentEventHttpMessageReaderTests.java
View File

@ -161,6 +161,17 @@ public class ServerSentEventHttpMessageReaderTests extends AbstractLeakCheckingT
.verify();
}
@Test // gh-24389
void readPojoWithCommentOnly() {
MockServerHttpRequest request = MockServerHttpRequest.post("/")
.body(Flux.just(stringBuffer(":ping\n"), stringBuffer("\n")));
Flux<Object> data = this.reader.read(
ResolvableType.forType(String.class), request, Collections.emptyMap());
StepVerifier.create(data).expectComplete().verify();
}
@Test // SPR-15331
public void decodeFullContentAsString() {
String body = "data:foo\ndata:bar\n\ndata:baz\n\n";