Corrigida regressão do bug [FWK-204].

Danilo Costa Viana
1 parent cddd8fc3
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
@@ -129,7 +129,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
 		joinTransactionIfNecessary();
 		T managedEntity = getEntityManagerDelegate().merge(entity);
 		checkEntityManagerScopePassivable(managedEntity);
-		return getEntityManagerDelegate().merge(entity);
+		return managedEntity;
 	}
 	/*
	@@ -129,7 +129,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {		@@ -129,7 +129,7 @@ public class EntityManagerProxy implements EntityManager, Serializable {
129	joinTransactionIfNecessary();	129	joinTransactionIfNecessary();
130	T managedEntity = getEntityManagerDelegate().merge(entity);	130	T managedEntity = getEntityManagerDelegate().merge(entity);
131	checkEntityManagerScopePassivable(managedEntity);	131	checkEntityManagerScopePassivable(managedEntity);
132	- return getEntityManagerDelegate().merge(entity);	132	+ return managedEntity;
133	}	133	}
134		134
135	/*	135	/*