From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 8 Apr 2009 11:25:45 +0000 (+0000)
Subject: Fix unlikely NPE
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3bafe657cd9498d51acdc7ab9e3d97f37690f994;p=tomcat7.0

Fix unlikely NPE

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

diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java
index 790f94164..39d623b90 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -834,10 +834,10 @@ public class ManagerServlet
         Container[] contexts = host.findChildren();
         for (int i = 0; i < contexts.length; i++) {
             Context context = (Context) contexts[i];
-            String displayPath = context.getPath();
-            if( displayPath.equals("") )
-                displayPath = "/";
             if (context != null ) {
+                String displayPath = context.getPath();
+                if( displayPath.equals("") )
+                    displayPath = "/";
                 if (context.getAvailable()) {
                     writer.println(sm.getString("managerServlet.listitem",
                                                 displayPath,