svn commit: r1435294 - in /rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion: JpaPageTemplateConverter.java JpaPageTemplateRegionConverter.java

[mfranklin]

Author: mfranklin
Date: Fri Jan 18 18:34:32 2013
New Revision: 1435294

URL: http://svn.apache.org/viewvc?rev=1435294&view=rev
Log:
Updated JpaPageTemplateRegion converters to be eclipselink compatible RAVE-875

Modified:
    
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
    
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java

Modified: 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java?rev=1435294&r1=1435293&r2=1435294&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
 (original)
+++ 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateConverter.java
 Fri Jan 18 18:34:32 2013
@@ -45,10 +45,6 @@ public class JpaPageTemplateConverter im
         JpaPageTemplate converted = null;
         if(source != null) {
             converted = source.getId() == null ? new JpaPageTemplate() : 
manager.find(JpaPageTemplate.class, Long.parseLong(source.getId()));
-
-            if(converted == null) {
-                converted = new JpaPageTemplate();
-            }
             updateProperties(source, converted);
         }
         return converted;

Modified: 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java?rev=1435294&r1=1435293&r2=1435294&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
 (original)
+++ 
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
 Fri Jan 18 18:34:32 2013
@@ -45,11 +45,7 @@ public class JpaPageTemplateRegionConver
         JpaPageTemplateRegion converted = null;
 
         if (source != null) {
-            converted = manager.find(JpaPageTemplateRegion.class, 
source.getId() == null ? null : Long.parseLong(source.getId()));
-
-            if (converted == null) {
-                converted = new JpaPageTemplateRegion();
-            }
+            converted = source.getId() == null ? new JpaPageTemplateRegion() : 
manager.find(JpaPageTemplateRegion.class, Long.parseLong(source.getId()));
             updateProperties(source, converted);
         }
         return converted;