|
|
@@ -419,11 +419,11 @@ public final class IOUtil {
|
|
|
* zip文件或目录(如: /tmp/, /tmp/abc.jar, /tmp/abc.war等)
|
|
|
* @param relativeFilePath
|
|
|
* 要读取的文件的相对路径(如:META-INF/winter/xyz.txt)
|
|
|
- * @return 文件字节数组
|
|
|
+ * @return 文件字节数组(若不存在,则返回null)
|
|
|
*/
|
|
|
public static byte[] readFileFromWorkbenchRoot(File workbenchRoot, String relativeFilePath) {
|
|
|
byte[] bytes;
|
|
|
- // jar文件
|
|
|
+ // 文件
|
|
|
if (workbenchRoot.isFile()) {
|
|
|
String workDirName = workbenchRoot.getName();
|
|
|
// 可执行jar or 可执行war
|
|
|
@@ -432,10 +432,10 @@ public final class IOUtil {
|
|
|
}
|
|
|
bytes = JarUtil.getFileFromZip(workbenchRoot, relativeFilePath);
|
|
|
} else {
|
|
|
- // war解压的目录
|
|
|
+ // 目录
|
|
|
File file = new File(workbenchRoot, relativeFilePath);
|
|
|
if (!file.exists()) {
|
|
|
- throw new ClassWinterException("file [" + relativeFilePath + "] non-exist, at workbenchRoot [" + workbenchRoot + "].");
|
|
|
+ return null;
|
|
|
}
|
|
|
bytes = IOUtil.toBytes(file);
|
|
|
}
|