[#261] Fix GenericModel.merge()

playframework · Oct 11, 2010 · 62c805d · 62c805d
1 parent 6f2937a
commit 62c805d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -1,5 +1,8 @@
 package play.db.jpa;
 
+/**
+ * Use play.db.jpa.GenericModel insteads
+ */
 @Deprecated
 public class JPASupport extends GenericModel {