From c7555dddff34b315645e7acf3e79b3ef5509b615 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Tue, 16 Apr 2013 20:14:49 -0700 Subject: [PATCH] Avoid NPE on LettuceConnectionFactory destroy --- .../redis/connection/lettuce/LettuceConnectionFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java index 5c2e59dba..2f735b6eb 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactory.java @@ -115,7 +115,9 @@ public class LettuceConnectionFactory implements InitializingBean, DisposableBea */ public void resetConnection() { synchronized (this.connectionMonitor) { - connection.close(); + if(this.connection != null) { + this.connection.close(); + } this.connection = null; } }