From c36f4577ab650da561b8b25b0907d70d154960a1 Mon Sep 17 00:00:00 2001 From: sjaakd Date: Thu, 20 Oct 2016 21:03:42 +0200 Subject: [PATCH] #921 Avoid generation of duplicate local variable name --- .../org/mapstruct/ap/internal/model/PropertyMapping.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java index 9deb776c0..342b2d69a 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java @@ -388,8 +388,9 @@ public class PropertyMapping extends ModelElement { private void useLocalVarWhenNested(Assignment rightHandSide) { if ( sourceReference.getPropertyEntries().size() > 1 ) { - String sourceTypeName = rightHandSide.getSourceType().getName(); - String safeName = Strings.getSaveVariableName( sourceTypeName, existingVariableNames ); + String name = first( sourceReference.getPropertyEntries() ).getName(); + String safeName = Strings.getSaveVariableName( name, existingVariableNames ); + existingVariableNames.add( safeName ); rightHandSide.setSourceLocalVarName( safeName ); } }