Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48296

Generics and JavaDoc fixes
Patch provided by sebb

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@885999 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
index a787b1e..d92ef78 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
@@ -631,7 +631,7 @@ public class JMXAccessorTask extends BaseRedirectorHelperTask {
             TabularDataSupport data = (TabularDataSupport) result;
             for (Iterator<Object> iter = data.keySet().iterator(); iter.hasNext();) {
                 Object key = iter.next();
-                for (Iterator<Object> iter1 = ((List<Object>) key).iterator(); iter1.hasNext();) {
+                for (Iterator<?> iter1 = ((List<?>) key).iterator(); iter1.hasNext();) {
                     Object key1 = iter1.next();
                     CompositeData valuedata = data.get(new Object[] { key1 });
                     Object value = valuedata.get("value");

diff --git a/java/org/apache/catalina/tribes/membership/Membership.java b/java/org/apache/catalina/tribes/membership/Membership.java
index b9d6eef..d96434e 100644 (file)
--- a/java/org/apache/catalina/tribes/membership/Membership.java
+++ b/java/org/apache/catalina/tribes/membership/Membership.java
@@ -68,7 +68,9 @@ public class Membership
     public Object clone() {
         synchronized (membersLock) {
             Membership clone = new Membership(local, memberComparator);
-            clone.map = (HashMap<MemberImpl, MbrEntry>) map.clone();
+            @SuppressWarnings("unchecked") // map is correct type already
+            final HashMap<MemberImpl, MbrEntry> tmpclone = (HashMap<MemberImpl, MbrEntry>) map.clone();
+            clone.map = tmpclone;
             clone.members = new MemberImpl[members.length];
             System.arraycopy(members,0,clone.members,0,members.length);
             return clone;
@@ -110,8 +112,8 @@ public class Membership
      * Notify the membership that this member has announced itself.
      *
      * @param member - the member that just pinged us
-     * @return - true if this member is new to the cluster, false otherwise.
-     * @return - false if this member is the local member or updated.
+     * @return - true if this member is new to the cluster, false otherwise.<br/>
+     * - false if this member is the local member or updated.
      */
     public synchronized boolean memberAlive(MemberImpl member) {
         boolean result = false;

diff --git a/java/org/apache/naming/resources/DirContextURLConnection.java b/java/org/apache/naming/resources/DirContextURLConnection.java
index a1e1f07..cc92b29 100644 (file)
--- a/java/org/apache/naming/resources/DirContextURLConnection.java
+++ b/java/org/apache/naming/resources/DirContextURLConnection.java
@@ -256,7 +256,7 @@ public class DirContextURLConnection
       }
 
       if (attributes == null)
-          return (Collections.EMPTY_MAP);
+          return (Collections.emptyMap());
 
       HashMap<String,List<String>> headerFields =
           new HashMap<String,List<String>>(attributes.size());
@@ -347,6 +347,7 @@ public class DirContextURLConnection
     /**
      * Get object content.
      */
+    @SuppressWarnings("unchecked") // overridden method uses raw type Class[]
     @Override
     public Object getContent(Class[] classes)
         throws IOException {