From 3827e048d122fe553d69e9ab48be21a69b87ab12 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Fri, 26 Sep 2014 12:32:04 -0700
Subject: [PATCH] Protect against NPE when escaping LiveBeansView

Issue: SPR-12252
---
 .../org/springframework/context/support/LiveBeansView.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
index e76ed0fed4c..7c7bb1eeaf7 100644
--- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
+++ b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java
@@ -220,6 +220,9 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar
 	 */
 	protected String getEscapedResourceDescription(BeanDefinition bd) {
 		String resourceDescription = bd.getResourceDescription();
+		if (resourceDescription == null) {
+			return null;
+		}
 		StringBuilder result = new StringBuilder(resourceDescription.length() + 16);
 		for (int i = 0; i < resourceDescription.length(); i++) {
 			char character = resourceDescription.charAt(i);