From 4730ded4d8f882fed26816ad6664ffa001cdc8b9 Mon Sep 17 00:00:00 2001
From: sjaakd <sjaakderksen@zonnet.nl>
Date: Mon, 8 Dec 2014 21:34:40 +0100
Subject: [PATCH] #373 Removing superfluous null check when mapping parameter
 directly.

---
 .../src/main/java/org/mapstruct/ap/model/PropertyMapping.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
index a42e6828b..5c94375ce 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
@@ -189,6 +189,7 @@ public class PropertyMapping extends ModelElement {
             if ( targetAccessorType == TargetAccessorType.SETTER ) {
                 result = new SetterWrapper( result, method.getThrownTypes() );
                 if ( !sourceType.isPrimitive()
+                    && !sourceReference.getPropertyEntries().isEmpty() /* parameter null taken care of by beanmapper */
                     && ( result.getType() == TYPE_CONVERTED
                     || result.getType() == TYPE_CONVERTED_MAPPED
                     || result.getType() == DIRECT && targetType.isPrimitive() ) ) {