Guard against potential NPE if startup fails before container creation (

#876)
testcontainers · Sep 23, 2018 · 007c3b9 · 007c3b9
1 parent 2307b79
commit 007c3b9
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -296,18 +296,20 @@ private void tryStart(Profiler profiler) {
         } catch (Exception e) {
             logger().error("Could not start container", e);
 
-            // Log output if startup failed, either due to a container failure or exception (including timeout)
-            logger().error("Container log output (if any) will follow:");
-            FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback();
-            resultCallback.addConsumer(STDOUT, new Slf4jLogConsumer(logger()));
-            resultCallback.addConsumer(STDERR, new Slf4jLogConsumer(logger()));
-            dockerClient.logContainerCmd(containerId).withStdOut(true).withStdErr(true).exec(resultCallback);
-
-            // Try to ensure that container log output is shown before proceeding
-            try {
-                resultCallback.getCompletionLatch().await(1, TimeUnit.MINUTES);
-            } catch (InterruptedException ignored) {
-                // Cannot do anything at this point
+            if (containerId != null) {
+                // Log output if startup failed, either due to a container failure or exception (including timeout)
+                logger().error("Container log output (if any) will follow:");
+                FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback();
+                resultCallback.addConsumer(STDOUT, new Slf4jLogConsumer(logger()));
+                resultCallback.addConsumer(STDERR, new Slf4jLogConsumer(logger()));
+                dockerClient.logContainerCmd(containerId).withStdOut(true).withStdErr(true).exec(resultCallback);
+
+                // Try to ensure that container log output is shown before proceeding
+                try {
+                    resultCallback.getCompletionLatch().await(1, TimeUnit.MINUTES);
+                } catch (InterruptedException ignored) {
+                    // Cannot do anything at this point
+                }
             }
 
             throw new ContainerLaunchException("Could not create/start container", e);