Author: markt
Date: Wed Mar 30 15:41:02 2011
New Revision: 1086992
URL: http://svn.apache.org/viewvc?rev=1086992&view=rev
Log:
Fix Eclipse/FindBugs warnings apart from those that trigger bug 50984
Modified:
tomcat/trunk/java/org/apache/catalina/manager/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java
tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
tomcat/trunk/res/findbugs/filter-false-positives.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/Constants.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/Constants.java Wed Mar 30
15:41:02 2011
@@ -23,176 +23,187 @@ public class Constants {
public static final String Package = "org.apache.catalina.manager";
- public static final String HTML_HEADER_SECTION =
- "<html>\n" +
- "<head>\n" +
- "<style>\n" +
- org.apache.catalina.util.TomcatCSS.TOMCAT_CSS + "\n" +
- " table {\n" +
- " width: 100%;\n" +
- " }\n" +
- " td.page-title {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: white;\n" +
- " color: black;\n" +
- " }\n" +
- " td.title {\n" +
- " text-align: left;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-style:italic;\n" +
- " font-weight: bold;\n" +
- " background: #D2A41C;\n" +
- " }\n" +
- " td.header-left {\n" +
- " text-align: left;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " td.header-center {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " td.row-left {\n" +
- " text-align: left;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " td.row-center {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " td.row-right {\n" +
- " text-align: right;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " TH {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " TD {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " }\n" +
- " form {\n" +
- " margin: 1;\n" +
- " }\n" +
- " form.inline {\n" +
- " display: inline;\n" +
- " }\n" +
- "</style>\n";
-
- public static final String BODY_HEADER_SECTION =
- "<title>{0}</title>\n" +
- "</head>\n" +
- "\n" +
- "<body bgcolor=\"#FFFFFF\">\n" +
- "\n" +
- "<table cellspacing=\"4\" border=\"0\">\n" +
- " <tr>\n" +
- " <td colspan=\"2\">\n" +
- " <a href=\"http://www.apache.org/\";>\n" +
- " <img border=\"0\" alt=\"The Apache Software Foundation\"
align=\"left\"\n" +
- " src=\"{0}/images/asf-logo.gif\">\n" +
- " </a>\n" +
- " <a href=\"http://tomcat.apache.org/\";>\n" +
- " <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n" +
- " align=\"right\" src=\"{0}/images/tomcat.gif\">\n" +
- " </a>\n" +
- " </td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<hr size=\"1\" noshade=\"noshade\">\n" +
- "<table cellspacing=\"4\" border=\"0\">\n" +
- " <tr>\n" +
- " <td class=\"page-title\" bordercolor=\"#000000\" " +
- "align=\"left\" nowrap>\n" +
- " <font size=\"+2\">{1}</font>\n" +
- " </td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
-
- public static final String MESSAGE_SECTION =
- "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
- " <tr>\n" +
- " <td class=\"row-left\" width=\"10%\">" +
- "<small><strong>{0}</strong></small> </td>\n" +
- " <td class=\"row-left\"><pre>{1}</pre></td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
-
- public static final String MANAGER_SECTION =
- "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td colspan=\"4\" class=\"title\">{0}</td>\n" +
- "</tr>\n" +
- " <tr>\n" +
- " <td class=\"row-left\"><a href=\"{1}\">{2}</a></td>\n" +
- " <td class=\"row-center\"><a href=\"{3}\">{4}</a></td>\n" +
- " <td class=\"row-center\"><a href=\"{5}\">{6}</a></td>\n" +
- " <td class=\"row-right\"><a href=\"{7}\">{8}</a></td>\n" +
- " </tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
-
- public static final String SERVER_HEADER_SECTION =
- "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
- "<tr>\n" +
- " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
- "</tr>\n" +
- "<tr>\n" +
- " <td class=\"header-center\"><small>{1}</small></td>\n" +
- " <td class=\"header-center\"><small>{2}</small></td>\n" +
- " <td class=\"header-center\"><small>{3}</small></td>\n" +
- " <td class=\"header-center\"><small>{4}</small></td>\n" +
- " <td class=\"header-center\"><small>{5}</small></td>\n" +
- " <td class=\"header-center\"><small>{6}</small></td>\n" +
- "</tr>\n";
-
- public static final String SERVER_ROW_SECTION =
- "<tr>\n" +
- " <td class=\"row-center\"><small>{0}</small></td>\n" +
- " <td class=\"row-center\"><small>{1}</small></td>\n" +
- " <td class=\"row-center\"><small>{2}</small></td>\n" +
- " <td class=\"row-center\"><small>{3}</small></td>\n" +
- " <td class=\"row-center\"><small>{4}</small></td>\n" +
- " <td class=\"row-center\"><small>{5}</small></td>\n" +
- "</tr>\n" +
- "</table>\n" +
- "<br>\n" +
- "\n";
-
- public static final String HTML_TAIL_SECTION =
- "<hr size=\"1\" noshade=\"noshade\">\n" +
- "<center><font size=\"-1\" color=\"#525D76\">\n" +
- " <em>Copyright © 1999-2011, Apache Software Foundation</em>" +
- "</font></center>\n" +
- "\n" +
- "</body>\n" +
- "</html>";
+ public static final String HTML_HEADER_SECTION;
+ public static final String BODY_HEADER_SECTION;
+ public static final String MESSAGE_SECTION;
+ public static final String MANAGER_SECTION;
+ public static final String SERVER_HEADER_SECTION;
+ public static final String SERVER_ROW_SECTION;
+ public static final String HTML_TAIL_SECTION;
+
+ static {
+ HTML_HEADER_SECTION =
+ "<html>\n" +
+ "<head>\n" +
+ "<style>\n" +
+ org.apache.catalina.util.TomcatCSS.TOMCAT_CSS + "\n" +
+ " table {\n" +
+ " width: 100%;\n" +
+ " }\n" +
+ " td.page-title {\n" +
+ " text-align: center;\n" +
+ " vertical-align: top;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " font-weight: bold;\n" +
+ " background: white;\n" +
+ " color: black;\n" +
+ " }\n" +
+ " td.title {\n" +
+ " text-align: left;\n" +
+ " vertical-align: top;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " font-style:italic;\n" +
+ " font-weight: bold;\n" +
+ " background: #D2A41C;\n" +
+ " }\n" +
+ " td.header-left {\n" +
+ " text-align: left;\n" +
+ " vertical-align: top;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " font-weight: bold;\n" +
+ " background: #FFDC75;\n" +
+ " }\n" +
+ " td.header-center {\n" +
+ " text-align: center;\n" +
+ " vertical-align: top;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " font-weight: bold;\n" +
+ " background: #FFDC75;\n" +
+ " }\n" +
+ " td.row-left {\n" +
+ " text-align: left;\n" +
+ " vertical-align: middle;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " color: black;\n" +
+ " }\n" +
+ " td.row-center {\n" +
+ " text-align: center;\n" +
+ " vertical-align: middle;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " color: black;\n" +
+ " }\n" +
+ " td.row-right {\n" +
+ " text-align: right;\n" +
+ " vertical-align: middle;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " color: black;\n" +
+ " }\n" +
+ " TH {\n" +
+ " text-align: center;\n" +
+ " vertical-align: top;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " font-weight: bold;\n" +
+ " background: #FFDC75;\n" +
+ " }\n" +
+ " TD {\n" +
+ " text-align: center;\n" +
+ " vertical-align: middle;\n" +
+ " font-family:sans-serif,Tahoma,Arial;\n" +
+ " color: black;\n" +
+ " }\n" +
+ " form {\n" +
+ " margin: 1;\n" +
+ " }\n" +
+ " form.inline {\n" +
+ " display: inline;\n" +
+ " }\n" +
+ "</style>\n";
+
+ BODY_HEADER_SECTION =
+ "<title>{0}</title>\n" +
+ "</head>\n" +
+ "\n" +
+ "<body bgcolor=\"#FFFFFF\">\n" +
+ "\n" +
+ "<table cellspacing=\"4\" border=\"0\">\n" +
+ " <tr>\n" +
+ " <td colspan=\"2\">\n" +
+ " <a href=\"http://www.apache.org/\";>\n" +
+ " <img border=\"0\" alt=\"The Apache Software Foundation\"
align=\"left\"\n" +
+ " src=\"{0}/images/asf-logo.gif\">\n" +
+ " </a>\n" +
+ " <a href=\"http://tomcat.apache.org/\";>\n" +
+ " <img border=\"0\" alt=\"The Tomcat Servlet/JSP Container\"\n"
+
+ " align=\"right\" src=\"{0}/images/tomcat.gif\">\n" +
+ " </a>\n" +
+ " </td>\n" +
+ " </tr>\n" +
+ "</table>\n" +
+ "<hr size=\"1\" noshade=\"noshade\">\n" +
+ "<table cellspacing=\"4\" border=\"0\">\n" +
+ " <tr>\n" +
+ " <td class=\"page-title\" bordercolor=\"#000000\" " +
+ "align=\"left\" nowrap>\n" +
+ " <font size=\"+2\">{1}</font>\n" +
+ " </td>\n" +
+ " </tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\n";
+
+ MESSAGE_SECTION =
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ " <tr>\n" +
+ " <td class=\"row-left\" width=\"10%\">" +
+ "<small><strong>{0}</strong></small> </td>\n" +
+ " <td class=\"row-left\"><pre>{1}</pre></td>\n" +
+ " </tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\n";
+
+ MANAGER_SECTION =
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ "<tr>\n" +
+ " <td colspan=\"4\" class=\"title\">{0}</td>\n" +
+ "</tr>\n" +
+ " <tr>\n" +
+ " <td class=\"row-left\"><a href=\"{1}\">{2}</a></td>\n" +
+ " <td class=\"row-center\"><a href=\"{3}\">{4}</a></td>\n" +
+ " <td class=\"row-center\"><a href=\"{5}\">{6}</a></td>\n" +
+ " <td class=\"row-right\"><a href=\"{7}\">{8}</a></td>\n" +
+ " </tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\n";
+
+ SERVER_HEADER_SECTION =
+ "<table border=\"1\" cellspacing=\"0\" cellpadding=\"3\">\n" +
+ "<tr>\n" +
+ " <td colspan=\"6\" class=\"title\">{0}</td>\n" +
+ "</tr>\n" +
+ "<tr>\n" +
+ " <td class=\"header-center\"><small>{1}</small></td>\n" +
+ " <td class=\"header-center\"><small>{2}</small></td>\n" +
+ " <td class=\"header-center\"><small>{3}</small></td>\n" +
+ " <td class=\"header-center\"><small>{4}</small></td>\n" +
+ " <td class=\"header-center\"><small>{5}</small></td>\n" +
+ " <td class=\"header-center\"><small>{6}</small></td>\n" +
+ "</tr>\n";
+
+ SERVER_ROW_SECTION =
+ "<tr>\n" +
+ " <td class=\"row-center\"><small>{0}</small></td>\n" +
+ " <td class=\"row-center\"><small>{1}</small></td>\n" +
+ " <td class=\"row-center\"><small>{2}</small></td>\n" +
+ " <td class=\"row-center\"><small>{3}</small></td>\n" +
+ " <td class=\"row-center\"><small>{4}</small></td>\n" +
+ " <td class=\"row-center\"><small>{5}</small></td>\n" +
+ "</tr>\n" +
+ "</table>\n" +
+ "<br>\n" +
+ "\n";
+
+ HTML_TAIL_SECTION =
+ "<hr size=\"1\" noshade=\"noshade\">\n" +
+ "<center><font size=\"-1\" color=\"#525D76\">\n" +
+ " <em>Copyright © 1999-2011, Apache Software Foundation</em>"
+
+ "</font></center>\n" +
+ "\n" +
+ "</body>\n" +
+ "</html>";
+ }
+
public static final String CHARSET="utf-8";
public static final String XML_DECLARATION =
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=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Wed
Mar 30 15:41:02 2011
@@ -91,6 +91,7 @@ managerServlet.noRole=FAIL - User does n
managerServlet.noSelf=FAIL - The manager can not reload, undeploy, stop, or
undeploy itself
managerServlet.noWrapper=Container has not called setWrapper() for this servlet
managerServlet.notDeployed=FAIL - Context {0} is defined in server.xml and may
not be undeployed
+managerServlet.objectNameFail=FAIL - Unable to register object name [{0}] for
Manager Servlet
managerServlet.postCommand=FAIL - Tried to use command {0} via a GET request
but POST is required
managerServlet.reloaded=OK - Reloaded application at context path {0}
managerServlet.resourcesAll=OK - Listed global resources of all types
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Mar
30 15:41:02 2011
@@ -168,7 +168,7 @@ public class ManagerServlet extends Http
/**
* The Context container associated with our web application.
*/
- protected Context context = null;
+ protected transient Context context = null;
/**
@@ -200,7 +200,7 @@ public class ManagerServlet extends Http
/**
* The associated host.
*/
- protected Host host = null;
+ protected transient Host host = null;
/**
@@ -212,7 +212,7 @@ public class ManagerServlet extends Http
/**
* MBean server.
*/
- protected MBeanServer mBeanServer = null;
+ protected transient MBeanServer mBeanServer = null;
/**
@@ -225,7 +225,7 @@ public class ManagerServlet extends Http
* The global JNDI <code>NamingContext</code> for this server,
* if available.
*/
- protected javax.naming.Context global = null;
+ protected transient javax.naming.Context global = null;
/**
@@ -238,7 +238,7 @@ public class ManagerServlet extends Http
/**
* The Wrapper container associated with this servlet.
*/
- protected Wrapper wrapper = null;
+ protected transient Wrapper wrapper = null;
// ----------------------------------------------- ContainerServlet Methods
@@ -272,11 +272,12 @@ public class ManagerServlet extends Http
context = (Context) wrapper.getParent();
host = (Host) context.getParent();
Engine engine = (Engine) host.getParent();
+ String name = engine.getName() + ":type=Deployer,host=" +
+ host.getName();
try {
- oname = new ObjectName(engine.getName()
- + ":type=Deployer,host=" + host.getName());
+ oname = new ObjectName(name);
} catch (Exception e) {
- // ?
+ log(sm.getString("managerServlet.objectNameFail", name), e);
}
}
@@ -785,6 +786,7 @@ public class ManagerServlet extends Http
if (!validateContextName(cn, writer, smClient)) {
return;
}
+ @SuppressWarnings("null") // checked in call above
String name = cn.getName();
String baseName = cn.getBaseName();
String displayPath = cn.getDisplayName();
Modified:
tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/StatusManagerServlet.java Wed
Mar 30 15:41:02 2011
@@ -299,6 +299,7 @@ public class StatusManagerServlet
// ------------------------------------------- NotificationListener Methods
+ @Override
public void handleNotification(Notification notification,
java.lang.Object handback) {
Modified: tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/Constants.java Wed Mar
30 15:41:02 2011
@@ -23,86 +23,6 @@ public class Constants {
public static final String Package = "org.apache.catalina.manager.host";
- public static final String HTML_HEADER_SECTION =
- "<html>\n" +
- "<head>\n" +
- "<style>\n" +
- org.apache.catalina.util.TomcatCSS.TOMCAT_CSS + "\n" +
- " table {\n" +
- " width: 100%;\n" +
- " }\n" +
- " td.page-title {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: white;\n" +
- " color: black;\n" +
- " }\n" +
- " td.title {\n" +
- " text-align: left;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-style:italic;\n" +
- " font-weight: bold;\n" +
- " background: #D2A41C;\n" +
- " }\n" +
- " td.header-left {\n" +
- " text-align: left;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " td.header-center {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " td.row-left {\n" +
- " text-align: left;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " background: white;\n" +
- " }\n" +
- " td.row-center {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " background: white;\n" +
- " }\n" +
- " td.row-right {\n" +
- " text-align: right;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " background: white;\n" +
- " }\n" +
- " TH {\n" +
- " text-align: center;\n" +
- " vertical-align: top;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " font-weight: bold;\n" +
- " background: #FFDC75;\n" +
- " }\n" +
- " TD {\n" +
- " text-align: center;\n" +
- " vertical-align: middle;\n" +
- " font-family:sans-serif,Tahoma,Arial;\n" +
- " color: black;\n" +
- " background: white;\n" +
- " }\n" +
- " form {\n" +
- " margin: 1;\n" +
- " }\n" +
- " form.inline {\n" +
- " display: inline;\n" +
- " }\n" + "</style>\n";
-
public static final String BODY_HEADER_SECTION =
"<title>{0}</title>\n" +
"</head>\n" +
Modified:
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java
Wed Mar 30 15:41:02 2011
@@ -237,7 +237,7 @@ public final class HTMLHostManagerServle
PrintWriter writer = response.getWriter();
// HTML Header Section
- writer.print(Constants.HTML_HEADER_SECTION);
+
writer.print(org.apache.catalina.manager.Constants.HTML_HEADER_SECTION);
// Body Header Section
Object[] args = new Object[2];
Modified:
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/manager/util/BaseSessionComparator.java
Wed Mar 30 15:41:02 2011
@@ -39,6 +39,8 @@ public abstract class BaseSessionCompara
/* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
+ @SuppressWarnings("unchecked")
+ @Override
public final int compare(Session s1, Session s2) {
Comparable<T> c1 = getComparableObject(s1);
Comparable<T> c2 = getComparableObject(s2);
Modified:
tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/util/ReverseComparator.java
Wed Mar 30 15:41:02 2011
@@ -39,6 +39,7 @@ public class ReverseComparator implement
/* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
+ @Override
public int compare(Session o1, Session o2) {
int returnValue = comparator.compare(o1, o2);
return (- returnValue);
Modified: tomcat/trunk/res/findbugs/filter-false-positives.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/findbugs/filter-false-positives.xml?rev=1086992&r1=1086991&r2=1086992&view=diff
==============================================================================
--- tomcat/trunk/res/findbugs/filter-false-positives.xml (original)
+++ tomcat/trunk/res/findbugs/filter-false-positives.xml Wed Mar 30 15:41:02
2011
@@ -73,6 +73,12 @@
<Bug code="MSF" />
</Match>
<Match>
+ <!-- Catching exception is simpler than handling all the individual ones
-->
+ <Class name="org.apache.catalina.manager.util.SessionUtils" />
+ <Method name="guessLocaleFromSession" />
+ <Bug code="REC" />
+ </Match>
+ <Match>
<Class name="org.apache.catalina.realm.JDBCRealm" />
<Field name="containerLog" />
<Bug code="IS" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
