{0}

From: markt Date: Wed, 30 Mar 2011 15:41:02 +0000 (+0000) Subject: Fix Eclipse/FindBugs warnings apart from those that trigger bug 50984 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1013f02f65eb8bf2c621df90a3e40c4b90865a76;p=tomcat7.0 Fix Eclipse/FindBugs warnings apart from those that trigger bug 50984 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1086992 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/manager/Constants.java b/java/org/apache/catalina/manager/Constants.java index 057763fcb..c0b68421f 100644 --- a/java/org/apache/catalina/manager/Constants.java +++ b/java/org/apache/catalina/manager/Constants.java @@ -23,176 +23,187 @@ public class Constants { public static final String Package = "org.apache.catalina.manager"; - public static final String HTML_HEADER_SECTION = - "\n" + - "\n" + - "\n"; + 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 = + "\n" + + "\n" + + "\n"; + + BODY_HEADER_SECTION = + "{0}\n" + + "\n" + + "\n" + + "\n" + + "\n" + + "\n" + + " \n" + + " \n" + + " \n" + + "

\n" + + " \n" + + " $\"The$ \n" + + " \n" + + " \n" + + " $\"The$ \n" + + " \n" + + "

\n" + + "

\n" + + "\n" + + " \n" + + " \n" + + " \n" + + "

\n" + + " {1}\n" + + "

\n" + + "
\n" + + "\n"; + + MESSAGE_SECTION = + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + "

" + + "{0}

{1}

\n" + + "
\n" + + "\n"; + + MANAGER_SECTION = + "\n" + + "\n" + + " \n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "

{0}
{2}	{4}	{6}	{8}

\n" + + "
\n" + + "\n"; + + SERVER_HEADER_SECTION = + "\n" + + "\n" + + " \n" + + "\n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n"; + + SERVER_ROW_SECTION = + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + " \n" + + "\n" + + "

{0}
{1}	{2}	{3}	{4}	{5}	{6}
{0}	{1}	{2}	{3}	{4}	{5}

\n" + + "
\n" + + "\n"; + + HTML_TAIL_SECTION = + "

\n" + + "\n" + + " Copyright © 1999-2011, Apache Software Foundation" + + "\n" + + "\n" + + "\n" + + ""; + } - public static final String BODY_HEADER_SECTION = - "{0}\n" + - "\n" + - "\n" + - "\n" + - "\n" + - "\n" + - " \n" + - " \n" + - " \n" + - "

\n" + - " \n" + - " $\"The$ \n" + - " \n" + - " \n" + - " $\"The$ \n" + - " \n" + - "

\n" + - "

\n" + - "\n" + - " \n" + - " \n" + - " \n" + - "

\n" + - " {1}\n" + - "

\n" + - "
\n" + - "\n"; - - public static final String MESSAGE_SECTION = - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - "

" + - "{0}

{1}

\n" + - "
\n" + - "\n"; - - public static final String MANAGER_SECTION = - "\n" + - "\n" + - " \n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "

{0}
{2}	{4}	{6}	{8}

\n" + - "
\n" + - "\n"; - - public static final String SERVER_HEADER_SECTION = - "\n" + - "\n" + - " \n" + - "\n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n"; - - public static final String SERVER_ROW_SECTION = - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n" + - "

{0}
{1}	{2}	{3}	{4}	{5}	{6}
{0}	{1}	{2}	{3}	{4}	{5}

\n" + - "
\n" + - "\n"; - - public static final String HTML_TAIL_SECTION = - "

\n" + - "\n" + - " Copyright © 1999-2011, Apache Software Foundation" + - "\n" + - "\n" + - "\n" + - ""; public static final String CHARSET="utf-8"; public static final String XML_DECLARATION = diff --git a/java/org/apache/catalina/manager/LocalStrings.properties b/java/org/apache/catalina/manager/LocalStrings.properties index 3b02e0176..9ed856a4b 100644 --- a/java/org/apache/catalina/manager/LocalStrings.properties +++ b/java/org/apache/catalina/manager/LocalStrings.properties @@ -91,6 +91,7 @@ managerServlet.noRole=FAIL - User does not possess role {0} 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 diff --git a/java/org/apache/catalina/manager/ManagerServlet.java b/java/org/apache/catalina/manager/ManagerServlet.java index 72cf687ce..ab277305c 100644 --- a/java/org/apache/catalina/manager/ManagerServlet.java +++ b/java/org/apache/catalina/manager/ManagerServlet.java @@ -168,7 +168,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet { /** * 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 HttpServlet implements ContainerServlet { /** * The associated host. */ - protected Host host = null; + protected transient Host host = null; /** @@ -212,7 +212,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet { /** * MBean server. */ - protected MBeanServer mBeanServer = null; + protected transient MBeanServer mBeanServer = null; /** @@ -225,7 +225,7 @@ public class ManagerServlet extends HttpServlet implements ContainerServlet { * The global JNDI NamingContext 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 HttpServlet implements ContainerServlet { /** * 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 HttpServlet implements ContainerServlet { 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 HttpServlet implements ContainerServlet { if (!validateContextName(cn, writer, smClient)) { return; } + @SuppressWarnings("null") // checked in call above String name = cn.getName(); String baseName = cn.getBaseName(); String displayPath = cn.getDisplayName(); diff --git a/java/org/apache/catalina/manager/StatusManagerServlet.java b/java/org/apache/catalina/manager/StatusManagerServlet.java index 22a54fe1c..4bf605173 100644 --- a/java/org/apache/catalina/manager/StatusManagerServlet.java +++ b/java/org/apache/catalina/manager/StatusManagerServlet.java @@ -299,6 +299,7 @@ public class StatusManagerServlet // ------------------------------------------- NotificationListener Methods + @Override public void handleNotification(Notification notification, java.lang.Object handback) { diff --git a/java/org/apache/catalina/manager/host/Constants.java b/java/org/apache/catalina/manager/host/Constants.java index 973ae92f7..92d76bd21 100644 --- a/java/org/apache/catalina/manager/host/Constants.java +++ b/java/org/apache/catalina/manager/host/Constants.java @@ -23,86 +23,6 @@ public class Constants { public static final String Package = "org.apache.catalina.manager.host"; - public static final String HTML_HEADER_SECTION = - "\n" + - "\n" + - "\n"; - public static final String BODY_HEADER_SECTION = "{0}\n" + "\n" + diff --git a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java index 16238e2b7..9f8cd103d 100644 --- a/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java +++ b/java/org/apache/catalina/manager/host/HTMLHostManagerServlet.java @@ -237,7 +237,7 @@ public final class HTMLHostManagerServlet extends HostManagerServlet { 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]; diff --git a/java/org/apache/catalina/manager/util/BaseSessionComparator.java b/java/org/apache/catalina/manager/util/BaseSessionComparator.java index 73dc9a7db..ffc5c64b7 100644 --- a/java/org/apache/catalina/manager/util/BaseSessionComparator.java +++ b/java/org/apache/catalina/manager/util/BaseSessionComparator.java @@ -39,6 +39,8 @@ public abstract class BaseSessionComparator implements Comparator { /* (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 c1 = getComparableObject(s1); Comparable c2 = getComparableObject(s2); diff --git a/java/org/apache/catalina/manager/util/ReverseComparator.java b/java/org/apache/catalina/manager/util/ReverseComparator.java index 6bbbb9ddb..b699ef89d 100644 --- a/java/org/apache/catalina/manager/util/ReverseComparator.java +++ b/java/org/apache/catalina/manager/util/ReverseComparator.java @@ -39,6 +39,7 @@ public class ReverseComparator implements Comparator { /* (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); diff --git a/res/findbugs/filter-false-positives.xml b/res/findbugs/filter-false-positives.xml index 616535d76..c571dcc52 100644 --- a/res/findbugs/filter-false-positives.xml +++ b/res/findbugs/filter-false-positives.xml @@ -73,6 +73,12 @@ + + + + + +