From 0470dd62682fe578d4c946919a0d42a08c94b5c3 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Wed, 5 Jul 2017 13:06:33 +0200
Subject: [PATCH] DATAMONGO-1725 - Prevent NullPointerException in
 CloseableIterableCursorAdapter.close().

---
 .../springframework/data/mongodb/core/MongoTemplate.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index fca57dd5d..252b4e77d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -2740,8 +2740,13 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 		public void close() {
 
 			MongoCursor<Document> c = cursor;
+
 			try {
-				c.close();
+
+				if (c != null) {
+					c.close();
+				}
+
 			} catch (RuntimeException ex) {
 				throw potentiallyConvertRuntimeException(ex, exceptionTranslator);
 			} finally {