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

AbstractResponseBodySubscriber improvements 

- AbstractResponseBodySubscriber now checks if the current state is
   expected before changing to a new state.
 - Included comments by @violetagg
This commit is contained in:
Arjen Poutsma 2016-06-28 11:17:57 +02:00
parent 13b6f4fee4
commit 3a681fba89
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodySubscriber.java
View File

@ -139,8 +139,8 @@ abstract class AbstractResponseBodySubscriber implements Subscriber<DataBuffer>
*/
protected abstract void close();
private void changeState(State oldState, State newState) {
this.state.compareAndSet(oldState, newState);
private boolean changeState(State oldState, State newState) {
return this.state.compareAndSet(oldState, newState);
}
/**
@ -171,8 +171,9 @@ abstract class AbstractResponseBodySubscriber implements Subscriber<DataBuffer>
Subscription subscription) {
if (BackpressureUtils.validate(subscriber.subscription, subscription)) {
subscriber.subscription = subscription;
subscriber.changeState(this, REQUESTED);
subscription.request(1);
if (subscriber.changeState(this, REQUESTED)) {
subscription.request(1);
}
}
}
},
@ -186,15 +187,17 @@ abstract class AbstractResponseBodySubscriber implements Subscriber<DataBuffer>
@Override
void onNext(AbstractResponseBodySubscriber subscriber,
DataBuffer dataBuffer) {
subscriber.changeState(this, RECEIVED);
subscriber.receiveBuffer(dataBuffer);
if (subscriber.changeState(this, RECEIVED)) {
subscriber.receiveBuffer(dataBuffer);
}
}
@Override
void onComplete(AbstractResponseBodySubscriber subscriber) {
subscriber.subscriptionCompleted = true;
subscriber.changeState(this, COMPLETED);
subscriber.close();
if (subscriber.changeState(this, COMPLETED)) {
subscriber.subscriptionCompleted = true;
subscriber.close();
}
}
},
/**
@ -217,12 +220,14 @@ abstract class AbstractResponseBodySubscriber implements Subscriber<DataBuffer>
subscriber.releaseBuffer();
boolean subscriptionCompleted = subscriber.subscriptionCompleted;
if (!subscriptionCompleted) {
subscriber.changeState(this, REQUESTED);
subscriber.subscription.request(1);
if (subscriber.changeState(this, REQUESTED)) {
subscriber.subscription.request(1);
}
}
else {
subscriber.changeState(this, COMPLETED);
subscriber.close();
if (subscriber.changeState(this, COMPLETED)) {
subscriber.close();
}
}
}
}
@ -258,7 +263,7 @@ abstract class AbstractResponseBodySubscriber implements Subscriber<DataBuffer>
};
void onSubscribe(AbstractResponseBodySubscriber subscriber, Subscription s) {
throw new IllegalStateException(toString());
s.cancel();
}
void onNext(AbstractResponseBodySubscriber subscriber, DataBuffer dataBuffer) {
@ -266,9 +271,10 @@ abstract class AbstractResponseBodySubscriber implements Subscriber<DataBuffer>
}
void onError(AbstractResponseBodySubscriber subscriber, Throwable t) {
subscriber.changeState(this, COMPLETED);
subscriber.writeError(t);
subscriber.close();
if (subscriber.changeState(this, COMPLETED)) {
subscriber.writeError(t);
subscriber.close();
}
}
void onComplete(AbstractResponseBodySubscriber subscriber) {

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

@ -269,7 +269,8 @@ public class ServletHttpHandlerAdapter extends HttpServlet {
onWritePossible();
}
}
catch (IOException ignored) {
catch (IOException ex) {
onError(ex);
}
}
@ -277,13 +278,12 @@ public class ServletHttpHandlerAdapter extends HttpServlet {
protected boolean write(DataBuffer dataBuffer) throws IOException {
ServletOutputStream output = outputStream();
boolean ready = output.isReady();
if (this.flushOnNext) {
flush();
ready = output.isReady();
}
boolean ready = output.isReady();
if (this.logger.isTraceEnabled()) {
this.logger.trace("write: " + dataBuffer + " ready: " + ready);
}