From 22bb6f7598845ed13228630fb9291a0db5a1a768 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 24 Dec 2014 19:20:04 -0800
Subject: [PATCH] Fix accidental fork logic change

Fix accidental change from commit b42c7fca.
---
 .../src/main/java/org/springframework/boot/maven/RunMojo.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
index 9ca3babd1f..684b962894 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java
@@ -171,7 +171,8 @@ public class RunMojo extends AbstractDependencyFilterMojo {
 		findAgent();
 		boolean hasAgent = (this.agent != null && this.agent.length > 0);
 		boolean hasJvmArgs = (this.jvmArguments != null && this.jvmArguments.length() > 0);
-		if (Boolean.TRUE.equals(this.fork) || hasAgent || hasJvmArgs) {
+		if (Boolean.TRUE.equals(this.fork)
+				|| (this.fork == null && (hasAgent || hasJvmArgs))) {
 			runWithForkedJvm(startClassName);
 		}
 		else {