From 15185c75a395a42b1fd6db4c7f48e178d6f14a90 Mon Sep 17 00:00:00 2001
From: Stephane Maldini <smaldini@pivotal.io>
Date: Thu, 17 Dec 2015 13:34:09 +0000
Subject: [PATCH] use Publishers.onErrorResumeNext

---
 .../http/server/reactive/ErrorHandlingHttpHandler.java | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java
index 755e83bb53b..0050a4c0109 100644
--- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java
+++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java
@@ -20,8 +20,6 @@ import java.util.List;
 
 import org.reactivestreams.Publisher;
 import reactor.Publishers;
-import reactor.core.publisher.convert.RxJava1Converter;
-import rx.Observable;
 
 import org.springframework.util.Assert;
 
@@ -31,6 +29,7 @@ import org.springframework.util.Assert;
  * sequentially until one of them completes successfully.
  *
  * @author Rossen Stoyanchev
+ * @author Stephane Maldini
  */
 public class ErrorHandlingHttpHandler extends HttpHandlerDecorator {
 
@@ -62,12 +61,9 @@ public class ErrorHandlingHttpHandler extends HttpHandlerDecorator {
 	private static Publisher<Void> applyExceptionHandler(Publisher<Void> publisher,
 			HttpExceptionHandler handler, ServerHttpRequest request, ServerHttpResponse response) {
 
-		// see https://github.com/reactor/reactor/issues/580
-
-		Observable<Void> observable = RxJava1Converter.from(publisher).onErrorResumeNext(ex -> {
-			return RxJava1Converter.from(handler.handle(request, response, ex));
+		return Publishers.onErrorResumeNext(publisher, ex -> {
+			return handler.handle(request, response, ex);
 		});
-		return RxJava1Converter.from(observable);
 	}
 
 }