Merge branch '2.0.x'

2018-07-29 09:28:56 +01:00
parent bb7401a80d aeb885192e
commit 80da9cf5eb
48 changed files with 57 additions and 58 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
@@ -42,7 +42,7 @@ public class ChatService {
 	@Disconnect
 	public void onDisconnect(AtmosphereResourceEvent event) {
 		this.logger.info("Client {} disconnected [{}]", event.getResource().uuid(),
-				(event.isCancelled() ? "cancelled" : "closed"));
+				event.isCancelled() ? "cancelled" : "closed");
 	}

 	@org.atmosphere.config.service.Message(encoders = JacksonEncoderDecoder.class, decoders = JacksonEncoderDecoder.class)