Polishing

Author: jhoeller

spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectivePropertyAccessor.java

@@ -58,16 +58,17 @@
  */
 public class ReflectivePropertyAccessor implements PropertyAccessor {
 
+	private static final Set<Class<?>> ANY_TYPES = Collections.emptySet();
+
 	private static final Set<Class<?>> BOOLEAN_TYPES;
+
 	static {
 		Set<Class<?>> booleanTypes = new HashSet<Class<?>>();
 		booleanTypes.add(Boolean.class);
 		booleanTypes.add(Boolean.TYPE);
 		BOOLEAN_TYPES = Collections.unmodifiableSet(booleanTypes);
 	}
 
-	private static final Set<Class<?>> ANY_TYPES = Collections.emptySet();
-
 
 	private final Map<CacheKey, InvokerPair> readerCache = new ConcurrentHashMap<CacheKey, InvokerPair>(64);
 
@@ -122,7 +123,7 @@ public boolean canRead(EvaluationContext context, Object target, String name) th
 	}
 
 	public Member getLastReadInvokerPair() {
-		return lastReadInvokerPair.member;
+		return this.lastReadInvokerPair.member;
 	}
 
 	@Override

spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java

@@ -143,12 +143,14 @@ public List<SubProtocolHandler> getProtocolHandlers() {
 	public void addProtocolHandler(SubProtocolHandler handler) {
 		List<String> protocols = handler.getSupportedProtocols();
 		if (CollectionUtils.isEmpty(protocols)) {
-			logger.error("No sub-protocols for " + handler + ".");
+			if (logger.isErrorEnabled()) {
+				logger.error("No sub-protocols for " + handler);
+			}
 			return;
 		}
-		for (String protocol: protocols) {
+		for (String protocol : protocols) {
 			SubProtocolHandler replaced = this.protocolHandlerLookup.put(protocol, handler);
-			if ((replaced != null) && (replaced != handler) ) {
+			if (replaced != null && replaced != handler) {
 				throw new IllegalStateException("Can't map " + handler +
 						" to protocol '" + protocol + "'. Already mapped to " + replaced + ".");
 			}
@@ -316,9 +318,12 @@ public void handleMessage(WebSocketSession session, WebSocketMessage<?> message)
 	public void handleMessage(Message<?> message) throws MessagingException {
 		String sessionId = resolveSessionId(message);
 		if (sessionId == null) {
-			logger.error("Couldn't find sessionId in " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("Couldn't find session id in " + message);
+			}
 			return;
 		}
+
 		WebSocketSessionHolder holder = this.sessions.get(sessionId);
 		if (holder == null) {
 			if (logger.isDebugEnabled()) {
@@ -327,6 +332,7 @@ public void handleMessage(Message<?> message) throws MessagingException {
 			}
 			return;
 		}
+
 		WebSocketSession session = holder.getSession();
 		try {
 			findProtocolHandler(session).handleMessageToClient(session, message);
@@ -344,9 +350,11 @@ public void handleMessage(Message<?> message) throws MessagingException {
 				logger.debug("Failure while closing session " + sessionId + ".", secondException);
 			}
 		}
-		catch (Exception e) {
+		catch (Exception ex) {
 			// Could be part of normal workflow (e.g. browser tab closed)
-			logger.debug("Failed to send message to client in " + session + ": " + message, e);
+			if (logger.isDebugEnabled()) {
+				logger.debug("Failed to send message to client in " + session + ": " + message, ex);
+			}
 		}
 	}