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

Update Master to 5.1.0.BUILD-SNAPSHOT

Browse Source 
`JedisConnection.execute()` no longer accepts `null` arguments.

8adea79e67

* Spring Security 5.1; Reactor 3.2
This commit is contained in:
Gary Russell
2018-03-12 21:13:32 -04:00
committed by Artem Bilan
parent 6718d8d433
commit 525eb004ec
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build.gradle
View File

@@ -128,17 +128,17 @@ subprojects { subproject ->
mysqlVersion = '6.0.6'
pahoMqttClientVersion = '1.2.0'
postgresVersion = '42.0.0'
reactorNettyVersion = '0.7.5.RELEASE'
reactorVersion = '3.1.5.RELEASE'
reactorNettyVersion = '0.7.6.BUILD-SNAPSHOT'
reactorVersion = '3.2.0.BUILD-SNAPSHOT'
romeToolsVersion = '1.8.0'
servletApiVersion = '4.0.0'
smackVersion = '4.2.2'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.2.RELEASE'
springDataJpaVersion = '2.0.5.RELEASE'
springDataMongoVersion = '2.0.5.RELEASE'
springDataRedisVersion = '2.0.5.RELEASE'
springGemfireVersion = '2.0.5.RELEASE'
springSecurityVersion = '5.0.3.RELEASE'
springDataJpaVersion = '2.1.0.BUILD-SNAPSHOT'
springDataMongoVersion = '2.1.0.BUILD-SNAPSHOT'
springDataRedisVersion = '2.1.0.BUILD-SNAPSHOT'
springGemfireVersion = '2.1.0.BUILD-SNAPSHOT'
springSecurityVersion = '5.1.0.BUILD-SNAPSHOT'
springSocialTwitterVersion = '1.1.2.RELEASE'
springRetryVersion = '1.2.2.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.4.RELEASE'

2
gradle.properties
View File

@@ -1 +1 @@
version=5.0.4.BUILD-SNAPSHOT
version=5.1.0.BUILD-SNAPSHOT

7
spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2015 the original author or authors.
* Copyright 2014-2018 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.
@@ -35,12 +35,15 @@ import org.springframework.util.ObjectUtils;
* The Gateway component implementation to perform Redis commands with provided arguments and to return command result.
*
* @author Artem Bilan
* @author Gary Russell
* @since 4.0
*/
public class RedisOutboundGateway extends AbstractReplyProducingMessageHandler {
private static final SpelExpressionParser PARSER = new SpelExpressionParser();
private static final byte[][] EMPTY_ARGS = new byte[0][];
private final RedisTemplate<?, ?> redisTemplate;
private EvaluationContext evaluationContext;
@@ -131,7 +134,7 @@ public class RedisOutboundGateway extends AbstractReplyProducingMessageHandler {
}
}
final byte[][] actualArgs = args;
final byte[][] actualArgs = args != null ? args : EMPTY_ARGS;
return this.redisTemplate.execute(
(RedisCallback<Object>) connection -> connection.execute(command, actualArgs));