tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager HTMLManagerServlet.java
Date Mon, 03 Nov 2003 22:01:38 GMT
remm        2003/11/03 14:01:38

  Modified:    webapps/manager/WEB-INF/classes/org/apache/catalina/manager
                        HTMLManagerServlet.java
  Log:
  - Avoid NPE (which renders the HTML servlet unusable) if a context hasn't
    been started successfully.
  - Bug 24349.
  - Submitted by Ferenc Dobi.
  
  Revision  Changes    Path
  1.9       +10 -6     jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java
  
  Index: HTMLManagerServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/HTMLManagerServlet.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- HTMLManagerServlet.java	7 Sep 2003 18:47:14 -0000	1.8
  +++ HTMLManagerServlet.java	3 Nov 2003 22:01:38 -0000	1.9
  @@ -420,8 +420,12 @@
                   args[3] = response.encodeURL
                       (request.getContextPath() +
                        "/html/sessions?path=" + displayPath);
  -                args[4] =
  -                    new Integer(context.getManager().findSessions().length);
  +                if (context.getManager() != null) {
  +                    args[4] = new Integer
  +                        (context.getManager().findSessions().length);
  +                } else {
  +                    args[4] = new Integer(0);
  +                }
                   writer.print
                       (MessageFormat.format(APPS_ROW_DETAILS_SECTION, args));
   
  
  
  

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


Mime
View raw message