Merge branch 'dev-1.0' of Z:\static\source\sydapi-sge-database into dev-1.0

 Conflicts:

	src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java

src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java

@@ -63,18 +63,18 @@ public class ThreadBasedConnectPool<T> {
                         continue;
                     }
 
-                    boolean checkRet = false;
+                    boolean checkPass = false;
                     try {
                         l.lock();
-                        checkRet = check(entry.getValue().getObject());
+                        checkPass = check(entry.getValue().getObjectForCheck());
                     } catch (Exception e) {
-                        checkRet = false;
+                        checkPass = false;
                     }
                     finally {
                         l.unlock();
                     }
 
-                    if (checkRet) {
+                    if ( ! checkPass) {
                         log.debug("一个链接检查未通过");
                         // 检查未通过
                         it.remove();