From 97ded1dcc7763b785022f4e1ab8688a001195cc3 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 1 Sep 2017 14:05:35 +0200 Subject: [PATCH] Polishing --- .../org/springframework/context/annotation/AdviceMode.java | 5 ++++- .../messaging/simp/broker/SimpleBrokerMessageHandler.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java b/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java index 5b741d6069..c75a52c9e6 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/AdviceMode.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2017 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. @@ -27,6 +27,9 @@ package org.springframework.context.annotation; * @see org.springframework.transaction.annotation.EnableTransactionManagement#mode() */ public enum AdviceMode { + PROXY, + ASPECTJ + } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java index e77a960612..39d78aba89 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java @@ -364,7 +364,9 @@ public class SimpleBrokerMessageHandler extends AbstractBrokerMessageHandler { getClientOutboundChannel().send(reply); } catch (Throwable ex) { - logger.error("Failed to send " + message, ex); + if (logger.isErrorEnabled()) { + logger.error("Failed to send " + message, ex); + } } finally { SessionInfo info = this.sessions.get(subscriptionEntry.getKey());