|
@@ -16,7 +16,6 @@
|
|
|
|
|
|
|
|
package com.jfinal.template.source;
|
|
package com.jfinal.template.source;
|
|
|
|
|
|
|
|
-import java.io.BufferedReader;
|
|
|
|
|
import java.io.File;
|
|
import java.io.File;
|
|
|
import java.io.FileInputStream;
|
|
import java.io.FileInputStream;
|
|
|
import java.io.InputStreamReader;
|
|
import java.io.InputStreamReader;
|
|
@@ -92,18 +91,12 @@ public class FileSource implements ISource {
|
|
|
public static StringBuilder loadFile(File file, String encoding) {
|
|
public static StringBuilder loadFile(File file, String encoding) {
|
|
|
StringBuilder ret = new StringBuilder((int)file.length() + 3);
|
|
StringBuilder ret = new StringBuilder((int)file.length() + 3);
|
|
|
|
|
|
|
|
- try (BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding))) {
|
|
|
|
|
- // br = new BufferedReader(new FileReader(fileName));
|
|
|
|
|
- String line = br.readLine();
|
|
|
|
|
- if (line != null) {
|
|
|
|
|
- ret.append(line);
|
|
|
|
|
- } else {
|
|
|
|
|
- return ret;
|
|
|
|
|
|
|
+ char[] buf = new char[1024];
|
|
|
|
|
+ try (InputStreamReader isr = new InputStreamReader(new FileInputStream(file), encoding)) {
|
|
|
|
|
+ for (int num; (num = isr.read(buf, 0, buf.length)) != -1;) {
|
|
|
|
|
+ ret.append(buf, 0, num);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- while ((line=br.readLine()) != null) {
|
|
|
|
|
- ret.append('\n').append(line);
|
|
|
|
|
- }
|
|
|
|
|
return ret;
|
|
return ret;
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|