From 12e1fcbfabc72cb979392fe32d0550a4ff3757d6 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Mon, 8 Jan 2018 15:20:06 +0000
Subject: [PATCH] Do not pass null credential from ConnectionString to Mongo
 builder

---
 .../boot/autoconfigure/mongo/ReactiveMongoClientFactory.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
index afab018ec5..d438ac70b8 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
@@ -142,7 +142,9 @@ public class ReactiveMongoClientFactory {
 		builder.clusterSettings(getClusterSettings(connection));
 		builder.connectionPoolSettings(getConnectionPoolSettings(connection));
 		builder.serverSettings(getServerSettings(connection));
-		builder.credential(connection.getCredential());
+		if (connection.getCredential() != null) {
+			builder.credential(connection.getCredential());
+		}
 		builder.sslSettings(getSslSettings(connection));
 		builder.socketSettings(getSocketSettings(connection));
 		if (connection.getReadPreference() != null) {