Skip to content

Commit eed0af4

Browse files
committed
Polishing #1477
1 parent e7581a8 commit eed0af4

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/main/java/org/apache/ibatis/type/EnumOrdinalTypeHandler.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,36 +46,36 @@ public void setNonNullParameter(PreparedStatement ps, int i, E parameter, JdbcTy
4646

4747
@Override
4848
public E getNullableResult(ResultSet rs, String columnName) throws SQLException {
49-
int i = rs.getInt(columnName);
50-
if (i == 0 && rs.wasNull()) {
49+
int ordinal = rs.getInt(columnName);
50+
if (ordinal == 0 && rs.wasNull()) {
5151
return null;
5252
}
53-
return tryConvertIndexToEnum(i);
53+
return toOrdinalEnum(ordinal);
5454
}
5555

5656
@Override
5757
public E getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
58-
int i = rs.getInt(columnIndex);
59-
if (i == 0 && rs.wasNull()) {
58+
int ordinal = rs.getInt(columnIndex);
59+
if (ordinal == 0 && rs.wasNull()) {
6060
return null;
6161
}
62-
return tryConvertIndexToEnum(i);
62+
return toOrdinalEnum(ordinal);
6363
}
6464

6565
@Override
6666
public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
67-
int i = cs.getInt(columnIndex);
68-
if (i == 0 && cs.wasNull()) {
67+
int ordinal = cs.getInt(columnIndex);
68+
if (ordinal == 0 && cs.wasNull()) {
6969
return null;
7070
}
71-
return tryConvertIndexToEnum(i);
71+
return toOrdinalEnum(ordinal);
7272
}
7373

74-
private E tryConvertIndexToEnum(int i) {
74+
private E toOrdinalEnum(int ordinal) {
7575
try {
76-
return enums[i];
76+
return enums[ordinal];
7777
} catch (Exception ex) {
78-
throw new IllegalArgumentException("Cannot convert " + i + " to " + type.getSimpleName() + " by ordinal value.", ex);
78+
throw new IllegalArgumentException("Cannot convert " + ordinal + " to " + type.getSimpleName() + " by ordinal value.", ex);
7979
}
8080
}
8181
}

0 commit comments

Comments
 (0)