From b52136dfa5fcda00a6a5073470c6751ce96e1953 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 22 Mar 2020 20:28:59 +0100 Subject: [PATCH] Revert renaming of local variable This commit fixes the example by reverting the renaming of the local Actor variable to avoid a conflict with a same-named variable already in the current scope. See gh-24398 --- src/docs/asciidoc/data-access.adoc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc index 2e96c9e1208..a8d900f56cb 100644 --- a/src/docs/asciidoc/data-access.adoc +++ b/src/docs/asciidoc/data-access.adoc @@ -2733,10 +2733,10 @@ The following query finds and populates a single domain object: Actor actor = jdbcTemplate.queryForObject( "select first_name, last_name from t_actor where id = ?", (resultSet, rowNum) -> { - Actor actor = new Actor(); - actor.setFirstName(resultSet.getString("first_name")); - actor.setLastName(resultSet.getString("last_name")); - return actor; + Actor newActor = new Actor(); + newActor.setFirstName(resultSet.getString("first_name")); + newActor.setLastName(resultSet.getString("last_name")); + return newActor; }, 1212L); ----