Author: markt
Date: Sun Aug 22 14:56:20 2010
New Revision: 987916
URL: http://svn.apache.org/viewvc?rev=987916&view=rev
Log:
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
Modified:
tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java?rev=987916&r1=987915&r2=987916&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/JMXProxyServlet.java Sun Aug
22 14:56:20 2010
@@ -43,16 +43,17 @@ import org.apache.tomcat.util.modeler.Re
* @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 Htt
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[" +
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=987916&r1=987915&r2=987916&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Sun Aug 22 14:56:20 2010
@@ -487,6 +487,7 @@ public abstract class AbstractReplicated
* @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 AbstractReplicated
* @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 AbstractReplicated
}
}
+ @Override
public void messageReceived(Serializable msg, Member sender) {
if (! (msg instanceof MapMessage)) return;
@@ -654,6 +657,7 @@ public abstract class AbstractReplicated
} //end if
}
+ @Override
public boolean accept(Serializable msg, Member sender) {
boolean result = false;
if (msg instanceof MapMessage) {
@@ -714,10 +718,12 @@ public abstract class AbstractReplicated
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 AbstractReplicated
protected abstract Member[] publishEntryInfo(Object key, Object value)
throws ChannelException;
+ @Override
public void heartbeat() {
try {
ping(accessTimeout);
@@ -1096,7 +1103,7 @@ public abstract class AbstractReplicated
//------------------------------------------------------------------------------
// Map Entry class
//------------------------------------------------------------------------------
- public static class MapEntry implements Map.Entry {
+ public static class MapEntry implements Map.Entry<Object,Object> {
private boolean backup;
private boolean proxy;
private Member[] backupNodes;
@@ -1167,16 +1174,19 @@ public abstract class AbstractReplicated
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;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=987916&r1=987915&r2=987916&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Aug 22 14:56:20 2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -46,6 +46,10 @@
<bug>49714</bug>: The annotation process of Jar doesn't influence
distributable element of web.xml. (kfujino)
</fix>
+ <fix>
+ <bug>49757</bug>: Correct some generics warnings. Based on a patch
+ provided by Gábor. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
