From 20b88b5b5feb84e2e452bafed429348063890549 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Thu, 7 Jun 2018 13:05:57 -0400
Subject: [PATCH] Checks for null uri to avoid NPE

fixes gh-1051
---
 .../HttpClientConfigurableHttpConnectionFactory.java        | 2 +-
 .../HttpClientConfigurableHttpConnectionFactoryTest.java    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java
index 70d191b2..44b46cb6 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactory.java
@@ -71,7 +71,7 @@ public class HttpClientConfigurableHttpConnectionFactory implements Configurable
     }
 
     private void addHttpClient(JGitEnvironmentProperties properties) throws GeneralSecurityException {
-        if (properties.getUri().startsWith("http")) {
+        if (properties.getUri() != null && properties.getUri().startsWith("http")) {
             httpClientBuildersByUri.put(properties.getUri(), HttpClientSupport.builder(properties));
         }
     }
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java
index 03764048..dae0f601 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/HttpClientConfigurableHttpConnectionFactoryTest.java
@@ -32,6 +32,12 @@ public class HttpClientConfigurableHttpConnectionFactoryTest {
         assertThat(actual).isNotNull();
     }
 
+    @Test
+    public void nullPointerCheckGh1051() throws Exception {
+        MultipleJGitEnvironmentProperties properties = new MultipleJGitEnvironmentProperties();
+        connectionFactory.addConfiguration(properties);
+    }
+
     @Test
     public void matchingUrl() throws Exception {
         String url = "http://localhost/test.git";