Commit 6f61be14 authored by Noel Alonso's avatar Noel Alonso
Browse files

Realiza merge para evitar conflicto de entidades

parent b8e839e2

src/main/java/es/redmic/db/administrative/model/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class Activity extends ActivityBase { 


	// bi-directional many-to-one association to ActivityResource

	@OneToMany(mappedBy = "activity", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)

	private Set<ActivityResource> resources = new HashSet<>();

	private Set<ActivityResource> resources = new HashSet<ActivityResource>();



	public Activity() {

		// Constructor por defecto para que accedan los mappers

src/main/java/es/redmic/db/common/service/ServiceRWImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public abstract class ServiceRWImpl<TModel extends LongModel, TDTO extends DTO> 
	public TModel persist(TModel model) {

		try {

			model = repository.saveAndFlush(model);

			repository.refresh(model);

			repository.refresh(repository.merge(model));

		} catch (DataIntegrityViolationException e) {

			throw new DBConstraintViolationException(e);

		} catch (ConstraintViolationException e) {