zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Object的equals方法容易抛空指针异常，用java8的Objects.equals替换

Browse Source
This commit is contained in:
liuhuan
2019-12-28 18:58:10 +08:00
parent 3eedc8a761
commit 0a915248fc
11 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
View File

@@ -7,6 +7,7 @@ import java.io.OutputStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
@@ -339,7 +340,7 @@ public class Ftp extends AbstractFtp {
childPath = StrUtil.format("{}/{}", dirPath, name);
if (ftpFile.isDirectory()) {
// 上级和本级目录除外
if (false == name.equals(".") && false == name.equals("..")) {
if (false == Objects.equals(name,".") && false == Objects.equals(name,"..")) {
delDir(childPath);
}
} else {

3
hutool-extra/src/main/java/cn/hutool/extra/ssh/Sftp.java
View File

@@ -15,6 +15,7 @@ import java.io.File;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Vector;
/**
@@ -311,7 +312,7 @@ public class Sftp extends AbstractFtp {
String fileName;
for (LsEntry entry : list) {
fileName = entry.getFilename();
if (false == fileName.equals(".") && false == fileName.equals("..")) {
if (false == Objects.equals(fileName,".") && false == Objects.equals(fileName,"..")) {
if (entry.getAttrs().isDir()) {
delDir(fileName);
} else {