From 04c8b912eedd5a3d808f2fa73a7a262ded50ec2f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 8 Feb 2017 20:49:16 +0000
Subject: [PATCH] Fall back to standard LiveBeansView behaviour when MBean is
 in use

Closes gh-8146
---
 .../springframework/boot/actuate/endpoint/BeansEndpoint.java  | 3 +++
 spring-boot-samples/spring-boot-sample-actuator/pom.xml       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java
index 737e1b62a58..04dedfd6133 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java
@@ -75,6 +75,9 @@ public class BeansEndpoint extends AbstractEndpoint<List<Object>>
 
 		@Override
 		public String getSnapshotAsJson() {
+			if (this.leafContext == null) {
+				return super.getSnapshotAsJson();
+			}
 			return generateJson(getContextHierarchy());
 		}
 
diff --git a/spring-boot-samples/spring-boot-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
index ec0903ee05a..09e1da62c0e 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/pom.xml
+++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml
@@ -27,10 +27,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>