Protect against unlikely NPE

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1041458 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/mbeans/MBeanUtils.java b/java/org/apache/catalina/mbeans/MBeanUtils.java
index 3c574f2..7a62c2d 100644 (file)
--- a/java/org/apache/catalina/mbeans/MBeanUtils.java
+++ b/java/org/apache/catalina/mbeans/MBeanUtils.java
@@ -1648,7 +1648,7 @@ public class MBeanUtils {
         
         Container c = container;
         
-        while (!(c instanceof Engine)) {
+        while (!(c instanceof Engine) && c != null) {
             c = c.getParent();
         }