修复ClassUtil#scanJar未正确关闭文件问题

This commit is contained in:
Looly 2023-10-30 17:26:43 +08:00
parent 71ffe8a874
commit 46ce098add

View File

@ -17,6 +17,7 @@ import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.iter.EnumerationIter; import org.dromara.hutool.core.collection.iter.EnumerationIter;
import org.dromara.hutool.core.exception.ExceptionUtil; import org.dromara.hutool.core.exception.ExceptionUtil;
import org.dromara.hutool.core.io.IORuntimeException; import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileNameUtil; import org.dromara.hutool.core.io.file.FileNameUtil;
import org.dromara.hutool.core.io.resource.JarResource; import org.dromara.hutool.core.io.resource.JarResource;
import org.dromara.hutool.core.io.resource.ResourceUtil; import org.dromara.hutool.core.io.resource.ResourceUtil;
@ -366,22 +367,26 @@ public class ClassScanner implements Serializable {
} }
/** /**
* 扫描jar包 * 扫描jar包扫描结束后关闭jar文件
* *
* @param jar jar包 * @param jar jar包
*/ */
private void scanJar(final JarFile jar) { private void scanJar(final JarFile jar) {
String name; try{
for (final JarEntry entry : new EnumerationIter<>(jar.entries())) { String name;
name = StrUtil.removePrefix(entry.getName(), StrUtil.SLASH); for (final JarEntry entry : new EnumerationIter<>(jar.entries())) {
if (StrUtil.isEmpty(packagePath) || name.startsWith(this.packagePath)) { name = StrUtil.removePrefix(entry.getName(), StrUtil.SLASH);
if (name.endsWith(FileNameUtil.EXT_CLASS) && !entry.isDirectory()) { if (StrUtil.isEmpty(packagePath) || name.startsWith(this.packagePath)) {
final String className = name// if (name.endsWith(FileNameUtil.EXT_CLASS) && !entry.isDirectory()) {
final String className = name//
.substring(0, name.length() - 6)// .substring(0, name.length() - 6)//
.replace(CharUtil.SLASH, CharUtil.DOT);// .replace(CharUtil.SLASH, CharUtil.DOT);//
addIfAccept(loadClass(className)); addIfAccept(loadClass(className));
}
} }
} }
} finally {
IoUtil.closeQuietly(jar);
} }
} }