Protect against NPE in server tests

philwebb · philwebb · commit b4229239ab2e · 2020-01-22T12:54:35.000-08:00
Update `AbstractApplicationLauncher` to not attempt to shutdown
the process if startup fails.
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java
@@ -57,7 +57,9 @@ protected AbstractApplicationLauncher(ApplicationBuilder applicationBuilder, Bui
 
 	@Override
 	public void afterEach(ExtensionContext context) throws Exception {
-		this.process.destroy();
+		if (this.process != null) {
+			this.process.destroy();
+		}
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,9 @@ protected AbstractApplicationLauncher(ApplicationBuilder applicationBuilder, Bui`
`57`	`57`
`58`	`58`	`@Override`
`59`	`59`	`public void afterEach(ExtensionContext context) throws Exception {`
`60`		`- this.process.destroy();`
	`60`	`+ if (this.process != null) {`
	`61`	`+ this.process.destroy();`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`@Override`