From 525eb004ec966974750da8dea7fc4318a025bb93 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Mon, 12 Mar 2018 21:13:32 -0400
Subject: [PATCH] Update Master to 5.1.0.BUILD-SNAPSHOT

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

https://github.com/spring-projects/spring-data-redis/commit/8adea79e67b1ab55cfbeb12a8c215e8ed4bf21a2

* Spring Security 5.1; Reactor 3.2
---
 build.gradle                                       | 14 +++++++-------
 gradle.properties                                  |  2 +-
 .../redis/outbound/RedisOutboundGateway.java       |  7 +++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index aa80016ded..c9c9b757de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
diff --git a/gradle.properties b/gradle.properties
index e615d9b234..6adf0ecbeb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1 @@
-version=5.0.4.BUILD-SNAPSHOT
+version=5.1.0.BUILD-SNAPSHOT
diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java
index 2bab621229..59fc37fff2 100644
--- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java
+++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisOutboundGateway.java
@@ -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));