tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1041458 - /tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
Date Thu, 02 Dec 2010 17:07:08 GMT
Author: markt
Date: Thu Dec  2 17:07:07 2010
New Revision: 1041458

URL: http://svn.apache.org/viewvc?rev=1041458&view=rev
Log:
Protect against unlikely NPE

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1041458&r1=1041457&r2=1041458&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Thu Dec  2 17:07:07 2010
@@ -1648,7 +1648,7 @@ public class MBeanUtils {
         
         Container c = container;
         
-        while (!(c instanceof Engine)) {
+        while (!(c instanceof Engine) && c != null) {
             c = c.getParent();
         }
         



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message