Skip to content

Commit 525eb00

Browse files
garyrussellartembilan
authored andcommitted
Update Master to 5.1.0.BUILD-SNAPSHOT
`JedisConnection.execute()` no longer accepts `null` arguments. spring-projects/spring-data-redis@8adea79 * Spring Security 5.1; Reactor 3.2
1 parent 6718d8d commit 525eb00

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,17 @@ subprojects { subproject ->
128128
mysqlVersion = '6.0.6'
129129
pahoMqttClientVersion = '1.2.0'
130130
postgresVersion = '42.0.0'
131-
reactorNettyVersion = '0.7.5.RELEASE'
132-
reactorVersion = '3.1.5.RELEASE'
131+
reactorNettyVersion = '0.7.6.BUILD-SNAPSHOT'
132+
reactorVersion = '3.2.0.BUILD-SNAPSHOT'
133133
romeToolsVersion = '1.8.0'
134134
servletApiVersion = '4.0.0'
135135
smackVersion = '4.2.2'
136136
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.2.RELEASE'
137-
springDataJpaVersion = '2.0.5.RELEASE'
138-
springDataMongoVersion = '2.0.5.RELEASE'
139-
springDataRedisVersion = '2.0.5.RELEASE'
140-
springGemfireVersion = '2.0.5.RELEASE'
141-
springSecurityVersion = '5.0.3.RELEASE'
137+
springDataJpaVersion = '2.1.0.BUILD-SNAPSHOT'
138+
springDataMongoVersion = '2.1.0.BUILD-SNAPSHOT'
139+
springDataRedisVersion = '2.1.0.BUILD-SNAPSHOT'
140+
springGemfireVersion = '2.1.0.BUILD-SNAPSHOT'
141+
springSecurityVersion = '5.1.0.BUILD-SNAPSHOT'
142142
springSocialTwitterVersion = '1.1.2.RELEASE'
143143
springRetryVersion = '1.2.2.RELEASE'
144144
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.4.RELEASE'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=5.0.4.BUILD-SNAPSHOT
1+
version=5.1.0.BUILD-SNAPSHOT

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2015 the original author or authors.
2+
* Copyright 2014-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,12 +35,15 @@
3535
* The Gateway component implementation to perform Redis commands with provided arguments and to return command result.
3636
*
3737
* @author Artem Bilan
38+
* @author Gary Russell
3839
* @since 4.0
3940
*/
4041
public class RedisOutboundGateway extends AbstractReplyProducingMessageHandler {
4142

4243
private static final SpelExpressionParser PARSER = new SpelExpressionParser();
4344

45+
private static final byte[][] EMPTY_ARGS = new byte[0][];
46+
4447
private final RedisTemplate<?, ?> redisTemplate;
4548

4649
private EvaluationContext evaluationContext;
@@ -131,7 +134,7 @@ protected Object handleRequestMessage(Message<?> requestMessage) {
131134
}
132135
}
133136

134-
final byte[][] actualArgs = args;
137+
final byte[][] actualArgs = args != null ? args : EMPTY_ARGS;
135138

136139
return this.redisTemplate.execute(
137140
(RedisCallback<Object>) connection -> connection.execute(command, actualArgs));

0 commit comments

Comments
 (0)