Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in WriteResultPublisher

Browse Source 
between subscription and error from the Publish

Closes gh-25096
This commit is contained in:
Rossen Stoyanchev
2020-05-27 19:10:24 +01:00
parent bb96bd4f48
commit e25e6a68cf
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/http/server/reactive/WriteResultPublisher.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2018 the original author or authors. * Copyright 2002-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -182,6 +182,9 @@ class WriteResultPublisher implements Publisher<Void> {
@Override @Override
void publishError(WriteResultPublisher publisher, Throwable ex) { void publishError(WriteResultPublisher publisher, Throwable ex) {
publisher.errorBeforeSubscribed = ex; publisher.errorBeforeSubscribed = ex;
if(State.SUBSCRIBED.equals(publisher.state.get())) {
publisher.state.get().publishError(publisher, ex);
}
} }
}, },
@@ -200,6 +203,9 @@ class WriteResultPublisher implements Publisher<Void> {
@Override @Override
void publishError(WriteResultPublisher publisher, Throwable ex) { void publishError(WriteResultPublisher publisher, Throwable ex) {
publisher.errorBeforeSubscribed = ex; publisher.errorBeforeSubscribed = ex;
if(State.SUBSCRIBED.equals(publisher.state.get())) {
publisher.state.get().publishError(publisher, ex);
}
} }
}, },