Sunyard/sydapi-java-sge-database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check修改

Browse Source
This commit is contained in:
junj2.liang 2022-08-15 17:53:06 +08:00
parent 5518ffc457
commit d6003c4d76
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/sunyard/sge/database/pool/SydApiPool.java
View File

@ -8,6 +8,9 @@ import com.sunyard.sge.pool.ThreadBasedConnectPool;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import racal.sunyard.main.SydApi4j; import racal.sunyard.main.SydApi4j;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
public class SydApiPool extends ThreadBasedConnectPool<SydApi> { public class SydApiPool extends ThreadBasedConnectPool<SydApi> {
static { static {
SydApi.SYD_SetLogConfig("./logs/", 0); SydApi.SYD_SetLogConfig("./logs/", 0);
@ -56,25 +59,28 @@ public class SydApiPool extends ThreadBasedConnectPool<SydApi> {
// 保活接口 // 保活接口
protected boolean check(SydApi4Database o) { protected boolean check(SydApi4Database o) {
if (null==o) { // if (null == o) {
return false; // return false;
} // }
Lock l = new ReentrantLock();
l.lock();
SydApi4j[] hsms = o.getHsms(); SydApi4j[] hsms = o.getHsms();
for (SydApi4j hsm : hsms) { l.unlock();
if ( null != hsm ) { boolean ifBoolean = false;
int length = hsms.length;
for (int i = 0; i < length; i++) {
if (null != hsms[i]) {
try { try {
o.SYD_SM3_Hash_ShortData( new byte[8] ); o.SYD_SM3_Hash_ShortData(new byte[8]);
return true; ifBoolean = true;
} catch (Exception e) {
}catch ( Exception e) {
// 忽略 // 忽略
return false; hsms[i] = null;
} }
} }
} }
return false; return ifBoolean;
} }
// 释放 // 释放
protected void free(SydApi o) { protected void free(SydApi o) {
if ( null != o ) { if ( null != o ) {

3
src/main/java/com/sunyard/sge/pool/ThreadBasedConnectPool.java
View File

@ -30,7 +30,6 @@ public class ThreadBasedConnectPool<T> {
private PoolConfig config; private PoolConfig config;
public ThreadBasedConnectPool(PoolConfig config) { public ThreadBasedConnectPool(PoolConfig config) {
Lock l = new ReentrantLock();
this.config = config; this.config = config;
threadPool.scheduleAtFixedRate(new Runnable() { threadPool.scheduleAtFixedRate(new Runnable() {
@Override @Override
@ -65,13 +64,11 @@ public class ThreadBasedConnectPool<T> {
boolean checkPass = false; boolean checkPass = false;
try { try {
l.lock();
checkPass = check(entry.getValue().getObjectForCheck()); checkPass = check(entry.getValue().getObjectForCheck());
} catch (Exception e) { } catch (Exception e) {
checkPass = false; checkPass = false;
} }
finally { finally {
l.unlock();
} }
if ( ! checkPass) { if ( ! checkPass) {