svn commit: r1557570 - in /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2: DelegatingCallableStatement.java DelegatingPreparedStatement.java

[markt]

Author: markt
Date: Sun Jan 12 17:49:43 2014
New Revision: 1557570

URL: http://svn.apache.org/r1557570
Log:
DBCP-317.
Partial fix. Remove unnecessary equals() methods.

Modified:
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java?rev=1557570&r1=1557569&r2=1557570&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
 Sun Jan 12 17:49:43 2014
@@ -71,22 +71,6 @@ public class DelegatingCallableStatement
         super(c, s);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-       if (this == obj) return true;
-        CallableStatement delegate = (CallableStatement) 
getInnermostDelegate();
-        if (delegate == null) {
-            return false;
-        }
-        if (obj instanceof DelegatingCallableStatement) {
-            DelegatingCallableStatement s = (DelegatingCallableStatement) obj;
-            return delegate.equals(s.getInnermostDelegate());
-        }
-        else {
-            return delegate.equals(obj);
-        }
-    }
-
     /** Sets my delegate. */
     public void setDelegate(CallableStatement s) {
         super.setDelegate(s);

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java?rev=1557570&r1=1557569&r2=1557570&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
 Sun Jan 12 17:49:43 2014
@@ -70,22 +70,6 @@ public class DelegatingPreparedStatement
         super(c, s);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-       if (this == obj) return true;
-        PreparedStatement delegate = (PreparedStatement) 
getInnermostDelegate();
-        if (delegate == null) {
-            return false;
-        }
-        if (obj instanceof DelegatingPreparedStatement) {
-            DelegatingPreparedStatement s = (DelegatingPreparedStatement) obj;
-            return delegate.equals(s.getInnermostDelegate());
-        }
-        else {
-            return delegate.equals(obj);
-        }
-    }
-
     /** Sets my delegate. */
     public void setDelegate(PreparedStatement s) {
         super.setDelegate(s);