From 62c805dfa3f9bc1d8e0c066b51aed9c53f29590d Mon Sep 17 00:00:00 2001
From: Guillaume Bort <guillaume.bort@gmail.com>
Date: Mon, 11 Oct 2010 19:52:41 +0200
Subject: [PATCH] [#261] Fix GenericModel.merge()

---
 framework/src/play/db/jpa/GenericModel.java | 3 +--
 framework/src/play/db/jpa/JPASupport.java   | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/src/play/db/jpa/GenericModel.java b/framework/src/play/db/jpa/GenericModel.java
index 12b0e3ac06..e9d6f1e7c0 100644
--- a/framework/src/play/db/jpa/GenericModel.java
+++ b/framework/src/play/db/jpa/GenericModel.java
@@ -185,8 +185,7 @@ public <T extends JPABase> T refresh() {
      * Merge this object to obtain a managed entity (usefull when the object comes from the Cache).
      */
     public <T extends JPABase> T merge() {
-        em().merge(this);
-        return (T) this;
+        return (T)em().merge(this);
     }
 
     /**
diff --git a/framework/src/play/db/jpa/JPASupport.java b/framework/src/play/db/jpa/JPASupport.java
index 52315adf5c..98975a2491 100644
--- a/framework/src/play/db/jpa/JPASupport.java
+++ b/framework/src/play/db/jpa/JPASupport.java
@@ -1,5 +1,8 @@
 package play.db.jpa;
 
+/**
+ * Use play.db.jpa.GenericModel insteads
+ */
 @Deprecated
 public class JPASupport extends GenericModel {