https://demoiselle.atlassian.net/browse/FWK-204

esaito
1 parent c925202c
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
@@ -130,7 +130,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
 		joinTransactionIfNecessary();
 		T managedEntity = getEntityManagerDelegate().merge(entity);
 		checkEntityManagerScopePassivable(managedEntity);
-		return getEntityManagerDelegate().merge(entity);
+		return entity;
 	}
 	/*
	@@ -130,7 +130,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {		@@ -130,7 +130,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
130	joinTransactionIfNecessary();	130	joinTransactionIfNecessary();
131	T managedEntity = getEntityManagerDelegate().merge(entity);	131	T managedEntity = getEntityManagerDelegate().merge(entity);
132	checkEntityManagerScopePassivable(managedEntity);	132	checkEntityManagerScopePassivable(managedEntity);
133	- return getEntityManagerDelegate().merge(entity);	133	+ return entity;
134	}	134	}
135		135
136	/*	136	/*