From: markt Date: Sun, 22 Aug 2010 14:56:20 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49757 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5769b3fd9a90f9b512b64eb13707adb5c1039de2;p=tomcat7.0 Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49757 Correct generics warnings and a couple of other warnings whilst I had the files open. Based on a patch by Gábor git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@987916 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java b/java/org/apache/catalina/manager/JMXProxyServlet.java index a612561eb..a882e6dce 100644 --- a/java/org/apache/catalina/manager/JMXProxyServlet.java +++ b/java/org/apache/catalina/manager/JMXProxyServlet.java @@ -43,16 +43,17 @@ import org.apache.tomcat.util.modeler.Registry; * @author Costin Manolache */ public class JMXProxyServlet extends HttpServlet { - // ----------------------------------------------------- Instance Variables + + private static final long serialVersionUID = 1L; + // ----------------------------------------------------- Instance Variables /** * MBean server. */ protected MBeanServer mBeanServer = null; protected Registry registry; - // --------------------------------------------------------- Public Methods - + // --------------------------------------------------------- Public Methods /** * Initialize this servlet. */ @@ -187,7 +188,7 @@ public class JMXProxyServlet extends HttpServlet { if( value==null ) continue; String valueString; try { - Class c = value.getClass(); + Class c = value.getClass(); if (c.isArray()) { int len = Array.getLength(value); StringBuilder sb = new StringBuilder("Array[" + diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java index 8a3bad07f..6bf564104 100644 --- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java +++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java @@ -487,6 +487,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements * @param msg Serializable * @return Serializable - null if no reply should be sent */ + @Override public Serializable replyRequest(Serializable msg, final Member sender) { if (! (msg instanceof MapMessage))return null; MapMessage mapmsg = (MapMessage) msg; @@ -544,6 +545,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements * @param msg Serializable * @param sender Member */ + @Override public void leftOver(Serializable msg, Member sender) { //left over membership messages if (! (msg instanceof MapMessage))return; @@ -563,6 +565,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements } } + @Override public void messageReceived(Serializable msg, Member sender) { if (! (msg instanceof MapMessage)) return; @@ -654,6 +657,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements } //end if } + @Override public boolean accept(Serializable msg, Member sender) { boolean result = false; if (msg instanceof MapMessage) { @@ -714,10 +718,12 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return result.toArray(new Member[result.size()]); } + @Override public void memberAdded(Member member) { //do nothing } + @Override public void memberDisappeared(Member member) { boolean removed = false; synchronized (mapMembers) { @@ -797,6 +803,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements protected abstract Member[] publishEntryInfo(Object key, Object value) throws ChannelException; + @Override public void heartbeat() { try { ping(accessTimeout); @@ -1096,7 +1103,7 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements //------------------------------------------------------------------------------ // Map Entry class //------------------------------------------------------------------------------ - public static class MapEntry implements Map.Entry { + public static class MapEntry implements Map.Entry { private boolean backup; private boolean proxy; private Member[] backupNodes; @@ -1167,16 +1174,19 @@ public abstract class AbstractReplicatedMap extends ConcurrentHashMap implements return primary; } + @Override public Object getValue() { return value; } + @Override public Object setValue(Object value) { Object old = this.value; this.value = value; return old; } + @Override public Object getKey() { return key; } diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index fe5c223c1..465703201 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -1,4 +1,4 @@ - +