From 3cd603a6df515de4cb97008a41184c3e26eebae8 Mon Sep 17 00:00:00 2001
From: esaito <emerson.saito@gmail.com>
Date: Wed, 19 Nov 2014 15:09:36 -0200
Subject: [PATCH] https://demoiselle.atlassian.net/browse/FWK-204

---
 impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
index 7670fee..cd12c4c 100644
--- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
+++ b/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;
 	}
 
 	/*
--
libgit2 0.21.2