When closing, look for the close method in proxy targets. Fixes #1253

Author: jameskleeh

grails-datastore-gorm/src/main/groovy/org/grails/datastore/gorm/jdbc/connections/DataSourceConnectionSource.java

@@ -3,6 +3,7 @@
 import org.grails.datastore.mapping.core.connections.DefaultConnectionSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.datasource.DelegatingDataSource;
 import org.springframework.util.ReflectionUtils;
 
 import javax.sql.DataSource;
@@ -26,10 +27,18 @@ public DataSourceConnectionSource(String name, DataSource source, DataSourceSett
     public void close() throws IOException {
         super.close();
         if(!closed) {
-            Method closeMethod = ReflectionUtils.findMethod(getSource().getClass(), "close");
+
+            DataSource source = getSource();
+            Method closeMethod = ReflectionUtils.findMethod(source.getClass(), "close");
+
+            while (closeMethod == null && source instanceof DelegatingDataSource) {
+                source = ((DelegatingDataSource) source).getTargetDataSource();
+                closeMethod = ReflectionUtils.findMethod(source.getClass(), "close");
+            }
+
             if(closeMethod != null) {
                 try {
-                    ReflectionUtils.invokeMethod(closeMethod, getSource());
+                    ReflectionUtils.invokeMethod(closeMethod, source);
                     this.closed = true;
                 } catch (Throwable e) {
                     LOG.warn("Error closing JDBC connection [{}]: {}", getName(), e.getMessage());