Polish

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/JmxAutoConfiguration.java

@@ -20,6 +20,7 @@ import javax.management.MBeanServer;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -87,7 +88,15 @@ public class JmxAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(MBeanServer.class)
 	public MBeanServer mbeanServer() {
-		return SpecificPlatform.get().getMBeanServer();
+		SpecificPlatform platform = SpecificPlatform.get();
+		if (platform != null) {
+			return platform.getMBeanServer();
+		}
+		MBeanServerFactoryBean factory = new MBeanServerFactoryBean();
+		factory.setLocateExistingServerIfPossible(true);
+		factory.afterPropertiesSet();
+		return factory.getObject();
+
 	}
 
 	@EnableMBeanExport(defaultDomain = "${spring.jmx.default_domain:}", server = "${spring.jmx.server:mbeanServer}")
@@ -112,16 +121,6 @@ public class JmxAutoConfiguration {
 			public FactoryBean<MBeanServer> getMBeanServerFactory() {
 				return new WebSphereMBeanServerFactoryBean();
 			}
-		},
-
-		GENERIC("org.springframework.jmx.support.MBeanServerFactoryBean") {
-			@Override
-			public FactoryBean<MBeanServer> getMBeanServerFactory() {
-				MBeanServerFactoryBean factory = new MBeanServerFactoryBean();
-				factory.setLocateExistingServerIfPossible(true);
-				factory.afterPropertiesSet();
-				return factory;
-			}
 		};
 
 		private final String identifyingClass;
@@ -131,9 +130,12 @@ public class JmxAutoConfiguration {
 		}
 
 		public MBeanServer getMBeanServer() {
-			Object server;
 			try {
-				server = getMBeanServerFactory().getObject();
+				FactoryBean<?> factory = getMBeanServerFactory();
+				if (factory instanceof InitializingBean) {
+					((InitializingBean) factory).afterPropertiesSet();
+				}
+				Object server = factory.getObject();
 				Assert.isInstanceOf(MBeanServer.class, server);
 				return (MBeanServer) server;
 			}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java

@@ -169,9 +169,10 @@ public class CommandRunner implements Iterable<Command> {
 		try {
 			ExitStatus result = run(argsWithoutDebugFlags);
 			// The caller will hang up if it gets a non-zero status
-			return result == null ? 0
+			if (result != null && result.isHangup()) {
-					: result.isHangup() ? (result.getCode() > 0 ? result.getCode() : 0)
+				return (result.getCode() > 0 ? result.getCode() : 0);
-							: 0;
+			}
+			return 0;
 		}
 		catch (NoArgumentsException ex) {
 			showUsage();

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/status/ExitStatus.java

@@ -27,12 +27,12 @@ package org.springframework.boot.cli.command.status;
 public final class ExitStatus {
 
 	/**
-	 * Generic "OK" exit status with zero exit code and hangup=fa;se
+	 * Generic "OK" exit status with zero exit code and {@literal hangup=false}
 	 */
 	public static ExitStatus OK = new ExitStatus(0, "OK");
 
 	/**
-	 * Generic "not OK" exit status with non-zero exit code and hangup=true
+	 * Generic "not OK" exit status with non-zero exit code and {@literal hangup=true}
 	 */
 	public static ExitStatus ERROR = new ExitStatus(-1, "ERROR", true);
 
@@ -44,7 +44,6 @@ public final class ExitStatus {
 
 	/**
 	 * Create a new ExitStatus with an exit code and name as specified.
-	 * 
 	 * @param code the exit code
 	 * @param name the name
 	 */
@@ -90,7 +89,6 @@ public final class ExitStatus {
 
 	/**
 	 * Convert the existing code to a hangup.
-	 * 
 	 * @return a new ExitStatus with hangup=true
 	 */
 	public ExitStatus hangup() {

spring-boot-docs/src/main/asciidoc/spring-boot-cli.adoc

@@ -265,13 +265,12 @@ executable jar file. For example:
 	$ spring jar my-app.jar *.groovy
 ----
 
-The resulting jar will contain the classes produced by compiling the
+The resulting jar will contain the classes produced by compiling the application and all
-application and all of the application's dependencies so that it can
+of the application's dependencies so that it can then be run using `java -jar`. The jar
-then be run using `java -jar`. The jar file will also contain entries
+file will also contain entries from the application's classpath. You can add explicit
-from the application's classpath. You can add explicit paths to the
+paths to the jar using `--include` and `--exclude` (both are comma separated, and both
-jar using `--include` and `--exclude` (both are comma separated, and
+accept prefixes to the values ``+'' and ``-'' to signify that they should be removed from
-both accept prefixes to the values "+" and "-" to signify that they
+the defaults). The default includes are
-shoudl be removed from the defaults). The default includes are
 
 [indent=0]
 ----