Fix a couple of 'high priority' FindBugs warnings

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

diff --git a/java/org/apache/catalina/tribes/membership/Membership.java b/java/org/apache/catalina/tribes/membership/Membership.java
index 86268ec..0b57408 100644 (file)
--- a/java/org/apache/catalina/tribes/membership/Membership.java
+++ b/java/org/apache/catalina/tribes/membership/Membership.java
@@ -18,6 +18,7 @@
 package org.apache.catalina.tribes.membership;
 
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -37,8 +38,8 @@ import org.apache.catalina.tribes.Member;
  * @author Peter Rossbach
  * @version $Id$
  */
-public class Membership
-{
+public class Membership implements Cloneable {
+
     protected static final MemberImpl[] EMPTY_MEMBERS = new MemberImpl[0];
     
     private final Object membersLock = new Object();
@@ -270,8 +271,12 @@ public class Membership
     
     // --------------------------------------------- Inner Class
 
-    private class MemberComparator implements Comparator<Member> {
+    private static class MemberComparator implements Comparator<Member>,
+            Serializable {
+
+        private static final long serialVersionUID = 1L;
 
+        @Override
         public int compare(Member m1, Member m2) {
             //longer alive time, means sort first
             long result = m2.getMemberAliveTime() - m1.getMemberAliveTime();

diff --git a/java/org/apache/tomcat/util/net/URL.java b/java/org/apache/tomcat/util/net/URL.java
index 714189b..592df54 100644 (file)
--- a/java/org/apache/tomcat/util/net/URL.java
+++ b/java/org/apache/tomcat/util/net/URL.java
@@ -316,6 +316,20 @@ public final class URL implements Serializable {
     }
 
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((file == null) ? 0 : file.hashCode());
+        result = prime * result + ((host == null) ? 0 : host.hashCode());
+        result = prime * result + port;
+        result = prime * result +
+                ((protocol == null) ? 0 : protocol.hashCode());
+        result = prime * result + ((ref == null) ? 0 : ref.hashCode());
+        return result;
+    }
+
+
     /**
      * Return the authority part of the URL.
      */