Author: markt
Date: Wed Jan 16 15:40:53 2008
New Revision: 612632
URL: http://svn.apache.org/viewvc?rev=612632&view=rev
Log:
Fix bug 43468. Prevent NPE.
Modified:
tomcat/trunk/build.properties.default
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
Modified: tomcat/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.properties.default?rev=612632&r1=612631&r2=612632&view=diff
==============================================================================
--- tomcat/trunk/build.properties.default (original)
+++ tomcat/trunk/build.properties.default Wed Jan 16 15:40:53 2008
@@ -43,12 +43,12 @@
compile.target=1.5
compile.debug=true
-base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-commons.loc=http://archive.apache.org/dist/commons
base-tomcat.loc=http://archive.apache.org/dist/tomcat
# ----- Commons Logging, version 1.1 or later -----
commons-logging-version=1.1.1
-commons-logging-src.loc=${base-jakarta.loc}/commons/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
+commons-logging-src.loc=${base-commons.loc}/logging/source/commons-logging-${commons-logging-version}-src.tar.gz
# ----- Webservices -----
jaxrpc-src.loc=http://repo1.maven.org/maven2/geronimo-spec/geronimo-spec-jaxrpc/1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar
@@ -68,18 +68,18 @@
# ----- Commons DBCP, version 1.1 or later -----
commons-dbcp.version=1.2.2
commons-dbcp.home=${base.path}/commons-dbcp-1.2.2-src
-commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
+commons-dbcp-src.loc=${base-commons.loc}/dbcp/source/commons-dbcp-1.2.2-src.tar.gz
# ----- Commons Pool, version 1.1 or later -----
-commons-pool.home=${base.path}/commons-pool-1.3-src
-commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.3-src.tar.gz
+commons-pool.home=${base.path}/commons-pool-1.4-src
+commons-pool-src.loc=${base-commons.loc}/pool/source/commons-pool-1.4-src.tar.gz
# ----- Commons Collections, version 2.0 or later -----
commons-collections.home=${base.path}/commons-collections-3.2-src
commons-collections.lib=${commons-collections.home}
commons-collections.jar=${commons-collections.lib}/commons-collections-3.2.jar
commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.2.tar.gz
-commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.2-src.tar.gz
+commons-collections-src.loc=${base-commons.loc}/collections/source/commons-collections-3.2-src.tar.gz
# ----- NSIS, version 2.0 or later -----
nsis.home=${base.path}/nsis-2.34
@@ -93,5 +93,5 @@
commons-daemon.home=${base.path}/commons-daemon-1.0.1
commons-daemon.lib=${commons-daemon.home}
commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
-commons-daemon.loc=${base-jakarta.loc}/commons/daemon/binaries/commons-daemon-1.0.1.tar.gz
+commons-daemon.loc=${base-commons.loc}/daemon/binaries/commons-daemon-1.0.1.tar.gz
commons-daemon.jsvc.tar.gz=${commons-daemon.lib}/bin/jsvc.tar.gz
Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=612632&r1=612631&r2=612632&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Wed
Jan 16 15:40:53 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/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=612632&r1=612631&r2=612632&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Wed
Jan 16 15:40:53 2008
@@ -46,6 +46,7 @@
htmlManagerServlet.list=List Applications
htmlManagerServlet.manager=Manager
htmlManagerServlet.messageLabel=Message:
+htmlManagerServlet.noManager=N/A
htmlManagerServlet.serverJVMVendor=JVM Vendor
htmlManagerServlet.serverJVMVersion=JVM Version
htmlManagerServlet.serverOSArch=OS Architecture
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
