svn commit: r1450609 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java

[solomax]

Author: solomax
Date: Wed Feb 27 06:00:18 2013
New Revision: 1450609

URL: http://svn.apache.org/r1450609
Log:
Equals/hashcode are updated to use address instead of name

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java?rev=1450609&r1=1450608&r2=1450609&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/basic/Server.java
 Wed Feb 27 06:00:18 2013
@@ -266,7 +266,7 @@ public class Server implements Serializa
                        return false;
                } else {
                        Server s = (Server)obj;
-                       return s.id == id && ((s.name != null && 
s.name.equals(name)) || (s.name == null && s.name == name));
+                       return s.id == id && ((s.address != null && 
s.address.equals(address)) || (s.address == null && s.address == address));
                }
        }
        
@@ -274,7 +274,7 @@ public class Server implements Serializa
        public int hashCode() {
                final int prime = 31;
                int result = 1;
-               result = prime * result + (int)id + (name == null ? 0 : 
name.hashCode());
+               result = prime * result + (int)id + (address == null ? 0 : 
address.hashCode());
                return result;
        }