From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 2 Dec 2010 17:07:07 +0000 (+0000)
Subject: Protect against unlikely NPE
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=73cd0b88962a4c0a8655fa2ebee42a2a57f0f0c4;p=tomcat7.0

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 3c574f25b..7a62c2d24 100644
--- 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();
         }