Skip to content

Commit a2a31d3

Browse files
committed
Merge branch 'wssccc-wssccc-fix-typo'
2 parents e384845 + 1a4a4d9 commit a2a31d3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/main/java/org/apache/ibatis/mapping/MappedStatement.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public Builder(Configuration configuration, String id, SqlSource sqlSource, SqlC
7878
logId = configuration.getLogPrefix() + id;
7979
}
8080
mappedStatement.statementLog = LogFactory.getLog(logId);
81-
mappedStatement.lang = configuration.getDefaultScriptingLanuageInstance();
81+
mappedStatement.lang = configuration.getDefaultScriptingLanguageInstance();
8282
}
8383

8484
public Builder resource(String resource) {

src/main/java/org/apache/ibatis/session/Configuration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ public void setDefaultScriptingLanguage(Class<?> driver) {
505505
getLanguageRegistry().setDefaultDriverClass(driver);
506506
}
507507

508-
public LanguageDriver getDefaultScriptingLanuageInstance() {
508+
public LanguageDriver getDefaultScriptingLanguageInstance() {
509509
return languageRegistry.getDefaultDriver();
510510
}
511511

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void shouldSuccessfullyLoadMinimalXMLConfigFile() throws Exception {
9494
assertThat(config.getJdbcTypeForNull(), is(JdbcType.OTHER));
9595
assertThat(config.getLazyLoadTriggerMethods(), is((Set<String>) new HashSet<String>(Arrays.asList("equals", "clone", "hashCode", "toString"))));
9696
assertThat(config.isSafeResultHandlerEnabled(), is(true));
97-
assertThat(config.getDefaultScriptingLanuageInstance(), is(instanceOf(XMLLanguageDriver.class)));
97+
assertThat(config.getDefaultScriptingLanguageInstance(), is(instanceOf(XMLLanguageDriver.class)));
9898
assertThat(config.isCallSettersOnNulls(), is(false));
9999
assertNull(config.getLogPrefix());
100100
assertNull(config.getLogImpl());
@@ -185,7 +185,7 @@ public void shouldSuccessfullyLoadXMLConfigFile() throws Exception {
185185
assertThat(config.getJdbcTypeForNull(), is(JdbcType.NULL));
186186
assertThat(config.getLazyLoadTriggerMethods(), is((Set<String>) new HashSet<String>(Arrays.asList("equals", "clone", "hashCode", "toString", "xxx"))));
187187
assertThat(config.isSafeResultHandlerEnabled(), is(false));
188-
assertThat(config.getDefaultScriptingLanuageInstance(), is(instanceOf(RawLanguageDriver.class)));
188+
assertThat(config.getDefaultScriptingLanguageInstance(), is(instanceOf(RawLanguageDriver.class)));
189189
assertThat(config.isCallSettersOnNulls(), is(true));
190190
assertThat(config.getLogPrefix(), is("mybatis_"));
191191
assertThat(config.getLogImpl().getName(), is(Slf4jImpl.class.getName()));

0 commit comments

Comments
 (0)