Commit e8293302 authored by neo.wang's avatar neo.wang

Merge branch 'dev_neo' into 'dev'

[DEV] fixed validate object for ftpclient

See merge request root/atms!59
parents 2c8f3c02 2e61cb2f
......@@ -80,13 +80,9 @@ public class FtpClientFactory implements PooledObjectFactory<FTPClient> {
@Override
public boolean validateObject(PooledObject<FTPClient> pooledObject) {
try {
logger.debug("validate object ftp client {} ", pooledObject.getObject().toString());
FTPClient ftpClient = pooledObject.getObject();
if (ftpClient == null || !ftpClient.isConnected()) {
return false;
}
ftpClient.changeWorkingDirectory("/");
return pooledObject.getObject().sendNoOp();
logger.debug("validateObject {}", pooledObject.getObject().toString());
return pooledObject.getObject().sendNoOp() && pooledObject.getObject().isAvailable()
&& pooledObject.getObject().isConnected();
} catch (IOException e) {
throw new RuntimeException("Failed to validate client: " + e, e);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment