From 8ff26ac0be4d16f6dcc20c35a923190a739752d8 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    | 6 +++++-
 1 file changed, 5 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 8062e1102..822458dff 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
@@ -2488,7 +2488,11 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware {
 
 			Cursor c = cursor;
 			try {
-				c.close();
+
+				if (c != null) {
+					c.close();
+				}
+
 			} catch (RuntimeException ex) {
 				throw potentiallyConvertRuntimeException(ex, exceptionTranslator);
 			} finally {