This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 38188f54bb7f275e97f0214d83161b52d8f3c451 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 23 09:45:02 2015 +0200 enregistrement des collections de references : --- .../java/fr/ird/observe/services/builder/DtoToEntityBuilder.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index 75fd352..d80a253 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -102,10 +102,13 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen ParameterizedType collectionGenericTypeType1 = (ParameterizedType) collectionGenericTypeSource; Type type1 = collectionGenericTypeType1.getActualTypeArguments()[0]; Class typeSource; + boolean sourceReference = false; if (type1 instanceof Class) { typeSource = (Class) type1; } else { - typeSource = (Class) ((ParameterizedType) type1).getActualTypeArguments()[0]; + ParameterizedType parameterizedType = (ParameterizedType) type1; + sourceReference = ReferenceDto.class.isAssignableFrom((Class) parameterizedType.getRawType()); + typeSource = (Class) parameterizedType.getActualTypeArguments()[0]; } ParameterizedType collectionGenericTypeType2 = (ParameterizedType) collectionGenericType; @@ -117,8 +120,7 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen typeTarget = (Class) ((ParameterizedType) type2).getActualTypeArguments()[0]; } - - if (ReferenceDto.class.isAssignableFrom(typeSource)) { + if (sourceReference) { Collection<ReferenceDto> referenceDtos = (Collection<ReferenceDto>) collection; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.