tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r612944 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/manager/HTMLManagerServlet.java java/org/apache/catalina/manager/LocalStrings.properties webapps/docs/changelog.xml
Date Thu, 17 Jan 2008 19:32:31 GMT
Author: markt
Date: Thu Jan 17 11:32:30 2008
New Revision: 612944

URL: http://svn.apache.org/viewvc?rev=612944&view=rev
Log:
Fix bug 43468. Possible NPE listing contexts in manager.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612944&r1=612943&r2=612944&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:32:30 2008
@@ -36,13 +36,6 @@
   +1: fhanik, markt, pero
   -1: 
 
-* Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43468
-  http://svn.apache.org/viewvc?rev=612632&view=rev
-  http://svn.apache.org/viewvc?rev=612647&view=rev
-  (less the build.properties changes)
-  +1: markt, pero, rjung
-  -1:
-
 * http://issues.apache.org/bugzilla/show_bug.cgi?id=43515
   http://svn.apache.org/viewvc?rev=612636&view=rev
   +1: markt, pero, rjung

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612944&r1=612943&r2=612944&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu Jan
17 11:32:30 2008
@@ -38,6 +38,7 @@
 
 import org.apache.catalina.Container;
 import org.apache.catalina.Context;
+import org.apache.catalina.Manager;
 import org.apache.catalina.Session;
 import org.apache.catalina.manager.util.BaseSessionComparator;
 import org.apache.catalina.manager.util.ReverseComparator;
@@ -440,7 +441,13 @@
                      "/html/expire?path=" + displayPath);
                 args[9] = appsExpire;
                 args[10] = sm.getString("htmlManagerServlet.expire.explain");
-                args[11] = new Integer(context.getManager().getMaxInactiveInterval()/60);
+                Manager manager = context.getManager();
+                if (manager == null) {
+                    args[11] = sm.getString("htmlManagerServlet.noManager");
+                } else {
+                    args[11] = new Integer(
+                            context.getManager().getMaxInactiveInterval()/60);
+                }
                 args[12] = sm.getString("htmlManagerServlet.expire.unit");
                 
                 args[13] = highlightColor;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=612944&r1=612943&r2=612944&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/manager/LocalStrings.properties Thu Jan
17 11:32:30 2008
@@ -46,6 +46,7 @@
 htmlManagerServlet.list=List Applications
 htmlManagerServlet.manager=Manager
 htmlManagerServlet.messageLabel=Message:
+htmlManagerServlet.noManager=-
 htmlManagerServlet.serverJVMVendor=JVM Vendor
 htmlManagerServlet.serverJVMVersion=JVM Version
 htmlManagerServlet.serverOSArch=OS Architecture

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612944&r1=612943&r2=612944&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:32:30 2008
@@ -226,6 +226,10 @@
         Nowaczyk. (markt)
       </fix>
       <fix>
+        <bug>43468</bug>: Fix possible NPE when listing contexts in the Manager
+        application. (markt)
+      </fix>
+      <fix>
         <bug>43611</bug>: Provide an error message if user tries to upload a
war
         for a context defined in server.xml rather than failing silently.
         (markt/jim)



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


Mime
View raw message