fix for http://code.google.com/p/mybatis/issues/detail?id=579 . toString() should never fail.

Author: emacarron

src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2011 The MyBatis Team
+ *    Copyright 2009-2012 The MyBatis Team
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -15,18 +15,18 @@
  */
 package org.apache.ibatis.datasource.pooled;
 
-import org.apache.ibatis.datasource.DataSourceException;
-import org.apache.ibatis.reflection.ExceptionUtil;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.apache.ibatis.reflection.ExceptionUtil;
 
 class PooledConnection implements InvocationHandler {
 
   private static final String CLOSE = "close";
-  private static final Class<?>[] IFACES = new Class<?>[]{Connection.class};
+  private static final Class<?>[] IFACES = new Class<?>[] { Connection.class };
 
   private int hashCode = 0;
   private PooledDataSource dataSource;
@@ -237,18 +237,23 @@ public Object invoke(Object proxy, Method method, Object[] args)
       return null;
     } else {
       try {
-        return method.invoke(getValidConnection(), args);
+        if (method.getDeclaringClass() != Object.class) {
+          // issue #578. 
+          // toString() should never fail
+          // throw an SQLException instead of a Runtime
+          checkConnection();
+        }
+        return method.invoke(realConnection, args);
       } catch (Throwable t) {
         throw ExceptionUtil.unwrapThrowable(t);
       }
     }
   }
 
-  private Connection getValidConnection() {
+  private void checkConnection() throws SQLException {
     if (!valid) {
-      throw new DataSourceException("Error accessing PooledConnection. Connection is invalid.");
+      throw new SQLException("Error accessing PooledConnection. Connection is invalid.");
     }
-    return realConnection;
   }
 
 }

src/test/java/org/apache/ibatis/jdbc/PooledDataSourceTest.java

@@ -69,4 +69,11 @@ public void shouldProperlyMaintainPoolOf3ActiveAnd2IdleConnections() throws Exce
     }
   }
 
+  @Test
+  public void shouldNotFailCallingToStringOverAnInvalidConnection() throws Exception {
+    PooledDataSource ds = createPooledDataSource(JPETSTORE_PROPERTIES);
+    Connection c = ds.getConnection();
+    c.close();
+    c.toString();
+  }
 }