root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-04-12 14:36:48 +02:00
parent f4ab574ea1 2579023035
commit 6567018b70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot/src/main/java/org/springframework/boot/admin/SpringApplicationAdminMXBean.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -33,9 +33,9 @@ public interface SpringApplicationAdminMXBean {
boolean isReady(); boolean isReady();
/** /**
* Specify if the application runs in an embedded web container. Can return * Specify if the application runs in an embedded web container. Return
* {@code null} if that information is not yet available. It is preferable to wait for * {@code false} on a web application that hasn't fully started yet, so it is
* the application to be {@link #isReady() ready}. * preferable to wait for the application to be {@link #isReady() ready}.
* @return {@code true} if the application runs in an embedded web container * @return {@code true} if the application runs in an embedded web container
* @see #isReady() * @see #isReady()
*/ */