From 6a74e62caa6a8ffaeeb559b3d76f9808739d2690 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 26 Feb 2013 20:26:46 -0800 Subject: [PATCH] Ticket #269: Removed equals() and hashCode() from MySQLConnection (now present in AbstractConnection). --- .../net/auth/mysql/MySQLConnection.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java index cd5ecba55..2eae0e17a 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java @@ -154,25 +154,6 @@ public class MySQLConnection extends AbstractConnection { return socket; } - @Override - public boolean equals(Object other) { - if(!(other instanceof MySQLConnection)) - return false; - boolean idsAreEqual = ((MySQLConnection)other).getConnectionID() == this.getConnectionID(); - // they are both new, check if they have the same name - if(idsAreEqual && this.getConnectionID() == 0) - return this.getIdentifier().equals(((MySQLConnection)other).getIdentifier()); - return idsAreEqual; - } - - @Override - public int hashCode() { - int hash = 7; - hash = 73 * hash + getConnectionID(); - hash = 73 * hash + getIdentifier().hashCode(); - return hash; - } - @Override public List getHistory() throws GuacamoleException { return Collections.unmodifiableList(history);