Skip to content

Commit 8fb6440

Browse files
authored
Merge pull request #1332 from wxisme/typo-fix
Typo fixes
2 parents cc106a1 + 940217c commit 8fb6440

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,10 @@ private PooledConnection popConnection(String username, String password) throws
421421
} catch (SQLException e) {
422422
/*
423423
Just log a message for debug and continue to execute the following
424-
statement like nothing happend.
424+
statement like nothing happened.
425425
Wrap the bad connection with a new PooledConnection, this will help
426-
to not intterupt current executing thread and give current thread a
427-
chance to join the next competion for another valid/good database
426+
to not interrupt current executing thread and give current thread a
427+
chance to join the next competition for another valid/good database
428428
connection. At the end of this loop, bad {@link @conn} will be set as null.
429429
*/
430430
log.debug("Bad connection. Could not roll back");

src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public Object invoke(Object proxy, Method method, Object[] params) throws Throwa
8686
* Creates a logging version of a PreparedStatement
8787
*
8888
* @param stmt - the statement
89-
* @param sql - the sql statement
89+
* @param statementLog - the statement log
90+
* @param queryStack - the query stack
9091
* @return - the proxy
9192
*/
9293
public static PreparedStatement newInstance(PreparedStatement stmt, Log statementLog, int queryStack) {

src/main/java/org/apache/ibatis/reflection/Reflector.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public Invoker getGetInvoker(String propertyName) {
427427
* Gets the type for a property setter
428428
*
429429
* @param propertyName - the name of the property
430-
* @return The Class of the propery setter
430+
* @return The Class of the property setter
431431
*/
432432
public Class<?> getSetterType(String propertyName) {
433433
Class<?> clazz = setTypes.get(propertyName);
@@ -441,7 +441,7 @@ public Class<?> getSetterType(String propertyName) {
441441
* Gets the type for a property getter
442442
*
443443
* @param propertyName - the name of the property
444-
* @return The Class of the propery getter
444+
* @return The Class of the property getter
445445
*/
446446
public Class<?> getGetterType(String propertyName) {
447447
Class<?> clazz = getTypes.get(propertyName);
@@ -461,7 +461,7 @@ public String[] getGetablePropertyNames() {
461461
}
462462

463463
/**
464-
* Gets an array of the writeable properties for an object
464+
* Gets an array of the writable properties for an object
465465
*
466466
* @return The array
467467
*/
@@ -470,10 +470,10 @@ public String[] getSetablePropertyNames() {
470470
}
471471

472472
/**
473-
* Check to see if a class has a writeable property by name
473+
* Check to see if a class has a writable property by name
474474
*
475475
* @param propertyName - the name of the property to check
476-
* @return True if the object has a writeable property by the name
476+
* @return True if the object has a writable property by the name
477477
*/
478478
public boolean hasSetter(String propertyName) {
479479
return setMethods.keySet().contains(propertyName);

0 commit comments

Comments
 (0)