From 85d3f5a18076a9067876f460d6454ee9346c1311 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 8 Jan 2018 22:04:05 -0800
Subject: [PATCH] Fix NPE in test containers

Fix NPE accidentally introduced during refinement.
---
 .../boot/testsupport/testcontainers/Container.java            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
index c5d874719c..089e194899 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Container.java
@@ -52,7 +52,9 @@ class Container implements TestRule {
 		this.containerFactory = () -> {
 			T container = (T) new GenericContainer<>(dockerImageName)
 					.withExposedPorts(port);
-			customizer.accept(container);
+			if (customizer != null) {
+				customizer.accept(container);
+			}
 			return container;
 		};
 	}