Call beginRequest on innerMostDelegate

Author: meedbek

src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java

@@ -131,15 +131,17 @@ public void abort(final Executor executor) throws SQLException {
     protected void activate() {
         closed = false;
         setLastUsed();
-        if (beginRequest != null && connection != null) {
-            try {
-                beginRequest.invoke(connection);
-            } catch (InvocationTargetException | IllegalAccessException ex) {
-                log.warn("Error calling beginRequest on connection", ex);
-            }
-        }
+
         if (connection instanceof DelegatingConnection) {
             ((DelegatingConnection<?>) connection).activate();
+        } else {
+            if (beginRequest != null && connection != null) {
+                try {
+                    beginRequest.invoke(connection);
+                } catch (InvocationTargetException | IllegalAccessException ex) {
+                    log.warn("Error calling beginRequest on connection", ex);
+                }
+            }
         }
     }
 

src/test/java/org/apache/commons/dbcp2/TesterConnection.java

@@ -425,12 +425,10 @@ public <T> T unwrap(final Class<T> iface) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
-    @Override
     public void beginRequest() {
         beginRequestCount.incrementAndGet();
     }
 
-    @Override
     public void endRequest() {
         endRequestCount.incrementAndGet();
     }