Polished the support for looking up column values by column label (SPR-7506)

Thomas Risberg · Thomas Risberg · commit 1247d2085b9e · 2010-09-08T18:59:28.000Z
diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java
@@ -131,13 +131,13 @@ public final SqlRowSetMetaData getMetaData() {
 	 */
 	public int findColumn(String columnLabel) throws InvalidResultSetAccessException {
 		Integer columnIndex = columnLabelMap.get(columnLabel);
-		try {
-			if (columnIndex == null) {
+		if (columnIndex == null) {
+			try {
 				columnIndex = this.resultSet.findColumn(columnLabel);
 			}
-		}
-		catch (SQLException se) {
-			throw new InvalidResultSetAccessException(se);
+			catch (SQLException se) {
+				throw new InvalidResultSetAccessException(se);
+			}
 		}
 		return columnIndex.intValue();
 	}

Original file line number	Diff line number	Diff line change
`@@ -131,13 +131,13 @@ public final SqlRowSetMetaData getMetaData() {`
`131`	`131`	`*/`
`132`	`132`	`public int findColumn(String columnLabel) throws InvalidResultSetAccessException {`
`133`	`133`	`Integer columnIndex = columnLabelMap.get(columnLabel);`
`134`		`- try {`
`135`		`- if (columnIndex == null) {`
	`134`	`+ if (columnIndex == null) {`
	`135`	`+ try {`
`136`	`136`	`columnIndex = this.resultSet.findColumn(columnLabel);`
`137`	`137`	`}`
`138`		`- }`
`139`		`- catch (SQLException se) {`
`140`		`- throw new InvalidResultSetAccessException(se);`
	`138`	`+ catch (SQLException se) {`
	`139`	`+ throw new InvalidResultSetAccessException(se);`
	`140`	`+ }`
`141`	`141`	`}`
`142`	`142`	`return columnIndex.intValue();`
`143`	`143`	`}`