Skip to content

Commit f19e7af

Browse files
authored
Merge pull request #26 from hazendaz/master
[ci] Use java 7 StandardCharsets instead of hard-coding
2 parents 422ef24 + e0b32c2 commit f19e7af

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/main/java/org/mybatis/scripting/freemarker/FreeMarkerLanguageDriver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424
import java.io.StringReader;
25+
import java.nio.charset.StandardCharsets;
2526
import java.util.Properties;
2627

2728
import org.apache.ibatis.executor.parameter.ParameterHandler;
@@ -88,7 +89,7 @@ protected freemarker.template.Configuration createFreeMarkerConfiguration() {
8889
cfg.setNumberFormat("computer");
8990

9091
// Because it defaults to default system encoding, we should set it always explicitly
91-
cfg.setDefaultEncoding("utf-8");
92+
cfg.setDefaultEncoding(StandardCharsets.UTF_8.name());
9293

9394
return cfg;
9495
}

0 commit comments

Comments
 (0)