Update SPR-13498

Author: rstoyanchev

SPR-13498/pom.xml

@@ -11,7 +11,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<java.version>1.8</java.version>
-		<spring.version>4.2.2.BUILD-SNAPSHOT</spring.version>
+		<spring.version>4.2.1.RELEASE</spring.version>
 		<slf4j.version>1.7.5</slf4j.version>
 
 		<jetty.version>9.3.3.v20150827</jetty.version>

SPR-13498/src/main/java/org/springframework/issues/.gitignore

@@ -15,40 +15,46 @@
  */
 package org.springframework.issues;
 
-import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.servlet.AsyncContext;
-import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
-public class AsyncServlet extends HttpServlet {
+// Demonstrates Tomcat issue:
+// https://bz.apache.org/bugzilla/show_bug.cgi?id=58457
+
+@Controller
+public class RawServletAsyncController extends HttpServlet {
 
 	private final AtomicInteger index = new AtomicInteger();
 
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+
+	@RequestMapping(path = "/async", method = RequestMethod.GET)
+	public void handle(HttpServletRequest request, ServletOutputStream os) throws Exception {
 
 		System.out.println("Starting async request");
-		AsyncContext asyncContext = req.startAsync(req, resp);
+		AsyncContext asyncContext = request.startAsync();
 		asyncContext.setTimeout(5000);
 
 		Executors.newScheduledThreadPool(1).scheduleAtFixedRate(() -> {
 			try {
 				int indexValue = index.getAndIncrement();
 				System.out.println(Thread.currentThread() + " index: " + indexValue);
-				resp.getOutputStream().println(Thread.currentThread() + " index: " + indexValue);
-				resp.getOutputStream().flush();
+				os.println(Thread.currentThread() + " index: " + indexValue);
+				os.flush();
 			}
 			catch (Throwable e) {
 				System.out.println("Exception: " + e.getMessage());
 			}
 
 		} , 1000, 1000, TimeUnit.MILLISECONDS);
-
 	}
+
 }

SPR-13498/src/main/java/org/springframework/issues/AsyncServlet.java renamed to SPR-13498/src/main/java/org/springframework/issues/RawServletAsyncController.java

@@ -1,6 +1,5 @@
 package org.springframework.issues;
 
-import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
@@ -18,28 +17,29 @@ public class SseController {
 	private static Logger logger = LoggerFactory.getLogger(SseController.class);
 
 
-	@RequestMapping(path = "/api/events", method = RequestMethod.GET)
+	@RequestMapping(path = "/sse", method = RequestMethod.GET)
 	public SseEmitter getEvents() {
+
 		SseEmitter emitter = new SseEmitter();
-		emitter.onTimeout(new Runnable() {
-			@Override
-			public void run() {
-				System.out.println("hello timeout");
-				emitter.complete();
-			}
-		});
+
+//		emitter.onTimeout(new Runnable() {
+//			@Override
+//			public void run() {
+//				System.out.println("hello timeout");
+//				emitter.complete();
+//			}
+//		});
+
 		Executors.newScheduledThreadPool(1).scheduleAtFixedRate(() -> {
 			try {
 				emitter.send(SseEmitter.event().data("Thread writing: " + Thread.currentThread()).name("ping"));
 			}
-			catch (Exception e) {
-				logger.error("In catch1: {}", e.getMessage());
-			}
-			catch (Throwable t) {
-				logger.error("In catch2: {}", t.getMessage());
+			catch (Throwable e) {
+				logger.error("In catch: {}", e.getMessage());
 			}
 
 		} , 1000, 1000, TimeUnit.MILLISECONDS);
+
 		return emitter;
 	}
 

SPR-13498/src/main/java/org/springframework/issues/SseController.java

@@ -1,35 +1,19 @@
 package org.springframework.issues.config;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
-@EnableWebMvc
-@ComponentScan(basePackages="org.springframework.issues")
 @Configuration
+@ComponentScan(basePackages="org.springframework.issues")
+@EnableWebMvc
 public class WebConfig extends WebMvcConfigurerAdapter {
 
 	@Override
 	public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
 		configurer.setDefaultTimeout(5000);
 	}
 
-	@Override
-	public void addViewControllers(ViewControllerRegistry registry) {
-		registry.addViewController("/").setViewName("home");
-	}
-	
-	@Bean
-	public InternalResourceViewResolver viewResolver() {
-		InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
-		viewResolver.setPrefix("/WEB-INF/views/");
-		viewResolver.setSuffix(".jsp");
-		return viewResolver;
-	}
-	
 }

SPR-13498/src/main/java/org/springframework/issues/config/WebConfig.java

@@ -21,7 +21,7 @@
 
 	<servlet>
 		<servlet-name>appServlet</servlet-name>
-		<servlet-class>org.springframework.issues.AsyncServlet</servlet-class>
+		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
 		<init-param>
 			<param-name>contextConfigLocation</param-name>
 			<param-value></param-value>
@@ -35,10 +35,4 @@
 		<url-pattern>/</url-pattern>
 	</servlet-mapping>
 
-	<!-- Disables Servlet Container welcome file handling. Needed for compatibility 
-		with Servlet 3.0 and Tomcat 7.0 -->
-	<welcome-file-list>
-		<welcome-file></welcome-file>
-	</welcome-file-list>
-
 </web-app>