From f2ac416f6615e2555b4a72599de11ef147cf0b82 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 4 Oct 2016 23:00:36 +0200 Subject: [PATCH] Consistent final logger fields (cherry picked from commit cfa0f6c) --- .../aop/target/dynamic/AbstractRefreshableTargetSource.java | 4 ++-- .../web/socket/server/support/OriginHandshakeInterceptor.java | 4 ++-- .../web/socket/sockjs/client/AbstractXhrTransport.java | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java index c96c21e1931..7bab7e07711 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/dynamic/AbstractRefreshableTargetSource.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ import org.springframework.aop.TargetSource; public abstract class AbstractRefreshableTargetSource implements TargetSource, Refreshable { /** Logger available to subclasses */ - protected Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); protected Object targetObject; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java index 0401a80c3b0..ac03be750e0 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/support/OriginHandshakeInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,7 +42,7 @@ import org.springframework.web.util.WebUtils; */ public class OriginHandshakeInterceptor implements HandshakeInterceptor { - protected Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); private final Set allowedOrigins = new LinkedHashSet(); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java index 2d0fac299e9..c6c6b9dc1ec 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java @@ -55,7 +55,7 @@ public abstract class AbstractXhrTransport implements XhrTransport { } - protected Log logger = LogFactory.getLog(getClass()); + protected final Log logger = LogFactory.getLog(getClass()); private boolean xhrStreamingDisabled; @@ -73,11 +73,9 @@ public abstract class AbstractXhrTransport implements XhrTransport { * An {@code XhrTransport} can support both the "xhr_streaming" and "xhr" * SockJS server transports. From a client perspective there is no * implementation difference. - * *

Typically an {@code XhrTransport} is used as "XHR streaming" first and * then, if that fails, as "XHR". In some cases however it may be helpful to * suppress XHR streaming so that only XHR is attempted. - * *

By default this property is set to {@code false} which means both * "XHR streaming" and "XHR" apply. */