Merge branch '2.1.x'

2019-04-02 15:58:59 -07:00
parent 04517495af eff2f92c48
commit 6bb5311984
36 changed files with 92 additions and 65 deletions
--- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java
+++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/ChatService.java
@@ -45,7 +45,8 @@ public class ChatService {
 				+ (event.isCancelled() ? "cancelled" : "closed") + "]");
 	}

-	@org.atmosphere.config.service.Message(encoders = JacksonEncoderDecoder.class, decoders = JacksonEncoderDecoder.class)
+	@org.atmosphere.config.service.Message(encoders = JacksonEncoderDecoder.class,
+			decoders = JacksonEncoderDecoder.class)
 	public Message onMessage(Message message) throws IOException {
 		this.logger.info("Author " + message.getAuthor() + " sent message "
 				+ message.getMessage());