Polish

rstoyanchev · rstoyanchev · commit b93579a43e97 · 2017-06-01T09:28:55.000-04:00
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteProcessor.java
@@ -163,11 +163,11 @@ protected void writingComplete() {
 	}
 
 	/**
-	 * Invoked when an error happens while writing. Defaults to no-op.
-	 * Servlet 3.1 based implementations will receive
-	 * {@link WriteListener#onError(Throwable)} event.
+	 * Invoked when an error happens while writing.
+	 * <p>Defaults to no-op. Servlet 3.1 based implementations will receive
+	 * {@code javax.servlet.WriteListener#onError(Throwable)} event.
 	 */
-	protected void writingFailed(Throwable t) {
+	protected void writingFailed(Throwable ex) {
 	}
 
 
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
@@ -192,9 +192,10 @@ public void onError(AsyncEvent event) {
 		}
 
 		void handleError(Throwable ex) {
-			if (bodyFlushProcessor != null) {
-				bodyFlushProcessor.cancel();
-				bodyFlushProcessor.onError(ex);
+			ResponseBodyFlushProcessor flushProcessor = bodyFlushProcessor;
+			if (flushProcessor != null) {
+				flushProcessor.cancel();
+				flushProcessor.onError(ex);
 			}
 
 			ResponseBodyProcessor processor = bodyProcessor;
@@ -206,9 +207,10 @@ void handleError(Throwable ex) {
 
 		@Override
 		public void onComplete(AsyncEvent event) {
-			if (bodyFlushProcessor != null) {
-				bodyFlushProcessor.cancel();
-				bodyFlushProcessor.onComplete();
+			ResponseBodyFlushProcessor flushProcessor = bodyFlushProcessor;
+			if (flushProcessor != null) {
+				flushProcessor.cancel();
+				flushProcessor.onComplete();
 			}
 
 			ResponseBodyProcessor processor = bodyProcessor;
diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java b/spring-web/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java
@@ -231,9 +231,9 @@ protected void writingComplete() {
 		}
 
 		@Override
-		protected void writingFailed(Throwable t) {
+		protected void writingFailed(Throwable ex) {
 			cancel();
-			onError(t);
+			onError(ex);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -163,11 +163,11 @@ protected void writingComplete() {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`/**`
`166`		`- * Invoked when an error happens while writing. Defaults to no-op.`
`167`		`- * Servlet 3.1 based implementations will receive`
`168`		`- * {@link WriteListener#onError(Throwable)} event.`
	`166`	`+ * Invoked when an error happens while writing.`
	`167`	`+ * <p>Defaults to no-op. Servlet 3.1 based implementations will receive`
	`168`	`+ * {@code javax.servlet.WriteListener#onError(Throwable)} event.`
`169`	`169`	`*/`
`170`		`- protected void writingFailed(Throwable t) {`
	`170`	`+ protected void writingFailed(Throwable ex) {`
`171`	`171`	`}`
`172`	`172`
`173`	`173`
Original file line number	Diff line number	Diff line change
`@@ -231,9 +231,9 @@ protected void writingComplete() {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`@Override`
`234`		`- protected void writingFailed(Throwable t) {`
	`234`	`+ protected void writingFailed(Throwable ex) {`
`235`	`235`	`cancel();`
`236`		`- onError(t);`
	`236`	`+ onError(ex);`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`