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
2022-08-15 15:41:15 +08:00 · 2022-08-15 15:41:15 +08:00 · 9fbebac1ea
commit 9fbebac1ea
parent 24335ccd95 6a5a335b24
2 changed files with 4 additions and 4 deletions
--- a/doc/黄金交易所数据库加密
+++ b/doc/黄金交易所数据库加密
--- a/src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java
+++ b/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();