Fix NPE in sql exception translation

Resolves #3968

Author: unintended

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java

@@ -32,9 +32,11 @@
 import org.springframework.batch.item.ReaderNotOpenException;
 import org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.jdbc.SQLWarningException;
+import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.support.JdbcUtils;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
@@ -220,6 +222,14 @@ protected SQLExceptionTranslator getExceptionTranslator() {
 		return exceptionTranslator;
 	}
 
+	protected DataAccessException translateSqlException(String task, String sql, SQLException ex) {
+		DataAccessException dae = getExceptionTranslator().translate(task, sql, ex);
+		if (dae != null) {
+			return dae;
+		}
+		return new UncategorizedSQLException(task, sql, ex);
+	}
+
 	/**
 	 * Throw a SQLWarningException if we're not ignoring warnings, else log the
 	 * warnings (at debug level).
@@ -262,7 +272,7 @@ private void moveCursorToRow(int row) {
 			}
 		}
 		catch (SQLException se) {
-			throw getExceptionTranslator().translate("Attempted to move ResultSet to last committed row", getSql(), se);
+			throw translateSqlException("Attempted to move ResultSet to last committed row", getSql(), se);
 		}
 	}
 
@@ -470,7 +480,7 @@ protected void initializeConnection() {
 		}
 		catch (SQLException se) {
 			close();
-			throw getExceptionTranslator().translate("Executing query", getSql(), se);
+			throw translateSqlException("Executing query", getSql(), se);
 		}
 	}
 
@@ -497,7 +507,7 @@ protected T doRead() throws Exception {
 			return item;
 		}
 		catch (SQLException se) {
-			throw getExceptionTranslator().translate("Attempt to process next row failed", getSql(), se);
+			throw translateSqlException("Attempt to process next row failed", getSql(), se);
 		}
 	}
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java

@@ -130,7 +130,7 @@ protected void openCursor(Connection con) {
 		}
 		catch (SQLException se) {
 			close();
-			throw getExceptionTranslator().translate("Executing query", getSql(), se);
+			throw translateSqlException("Executing query", getSql(), se);
 		}
 
 	}

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java

@@ -227,7 +227,7 @@ protected void openCursor(Connection con) {
 		}
 		catch (SQLException se) {
 			close();
-			throw getExceptionTranslator().translate("Executing stored procedure", getSql(), se);
+			throw translateSqlException("Executing stored procedure", getSql(), se);
 		}
 
 	}