GH-2428 - Polishing.

Author: michael-simons

src/main/java/org/springframework/data/neo4j/core/PreparedQuery.java

@@ -81,12 +81,11 @@ public Class<T> getResultType() {
 
 	@SuppressWarnings("unchecked")
 	public synchronized Optional<BiFunction<TypeSystem, Record, T>> getOptionalMappingFunction() {
-		Optional<BiFunction<TypeSystem, Record, T>> currentMappingFunction = Optional.ofNullable(
+		lastMappingFunction = Optional.ofNullable(
 						this.mappingFunctionSupplier)
 				.map(Supplier::get)
 				.map(f -> (BiFunction<TypeSystem, Record, T>) new AggregatingMappingFunction(f));
-		lastMappingFunction = currentMappingFunction;
-		return currentMappingFunction;
+		return lastMappingFunction;
 	}
 
 	synchronized boolean resultsHaveBeenAggregated() {