Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to SD-Hopper and other fixes

Browse Source 
Fixes https://build.spring.io/browse/INT-MJATS41-593

* Fix `LoggingHandler` JavaDoc
* Fix `JdbcOutboundGatewayParserTests` timing and race condition issues
* Add `mock(BeanFactory.class)` to the `JpaOutboundChannelAdapterTests` for `JpaExecutor`
* Fix `JpaOutboundChannelAdapterTests` for the incorrect transaction usage
This commit is contained in:
Artem Bilan
2016-04-07 10:26:55 -04:00
committed by Gary Russell
parent ba2a713c75
commit 13d11e5035
6 changed files with 143 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java
View File

@@ -24,7 +24,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.integration.dispatcher.AggregateMessageDeliveryException;
import org.springframework.integration.expression.ExpressionUtils;
import org.springframework.messaging.Message;
@@ -47,9 +46,6 @@ public class LoggingHandler extends AbstractMessageHandler {
FATAL, ERROR, WARN, INFO, DEBUG, TRACE
}
private static final SpelExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
private volatile Expression expression;
private volatile boolean expressionSet;
@@ -69,7 +65,7 @@ public class LoggingHandler extends AbstractMessageHandler {
* The valid levels are: FATAL, ERROR, WARN, INFO, DEBUG, or TRACE
* </p>
* @param level The level.
* @see LoggingHandler(Level)
* @see #LoggingHandler(Level)
*/
public LoggingHandler(String level) {
Assert.hasText(level, "'level' cannot be empty");