From 7ee15a4f2a3b13353e264c4ba04bbb2087ce489a Mon Sep 17 00:00:00 2001
From: Roman Terentiev <rterentiev@playtika.com>
Date: Tue, 16 May 2017 12:27:57 +0300
Subject: [PATCH] Add null checks

---
 .../server/environment/JGitEnvironmentRepository.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
index 50db97f3..1da9c00a 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/JGitEnvironmentRepository.java
@@ -444,8 +444,13 @@ public class JGitEnvironmentRepository extends AbstractScmEnvironmentRepository
 
 	private void configureCommand(TransportCommand<?, ?> command) {
 		command.setTimeout(this.timeout);
-		command.setTransportConfigCallback(this.transportConfigCallback);
-		command.setCredentialsProvider(getCredentialsProvider());
+		if (this.transportConfigCallback != null) {
+			command.setTransportConfigCallback(this.transportConfigCallback);
+		}
+		CredentialsProvider credentialsProvider = getCredentialsProvider();
+		if (credentialsProvider != null) {
+			command.setCredentialsProvider(credentialsProvider);
+		}
 	}
 
 	private CredentialsProvider getCredentialsProvider() {