You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/01/18 19:34:45 UTC
svn commit: r1435296 - in
/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion:
JpaPageTemplateWidgetConverter.java JpaWidgetCommentConverter.java
Author: mfranklin
Date: Fri Jan 18 18:34:45 2013
New Revision: 1435296
URL: http://svn.apache.org/viewvc?rev=1435296&view=rev
Log:
Updated JpaWidgetComment converters to be eclipselink compatible RAVE-875
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java?rev=1435296&r1=1435295&r2=1435296&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java Fri Jan 18 18:34:45 2013
@@ -45,10 +45,6 @@ public class JpaPageTemplateWidgetConver
JpaPageTemplateWidget converted = null;
if (source != null) {
converted = source.getId() == null ? new JpaPageTemplateWidget() : manager.find(JpaPageTemplateWidget.class, Long.parseLong(source.getId()));
-
- if (converted == null) {
- converted = new JpaPageTemplateWidget();
- }
updateProperties(source, converted);
}
return converted;
Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java?rev=1435296&r1=1435295&r2=1435296&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java Fri Jan 18 18:34:45 2013
@@ -18,7 +18,6 @@
*/
package org.apache.rave.portal.model.conversion;
-import org.apache.rave.model.ModelConverter;
import org.apache.rave.portal.model.JpaWidgetComment;
import org.apache.rave.portal.model.WidgetComment;
import org.springframework.stereotype.Component;
@@ -46,7 +45,7 @@ public class JpaWidgetCommentConverter {
private JpaWidgetComment createEntity(WidgetComment source, String widgetId) {
JpaWidgetComment converted = null;
if (source != null) {
- converted = manager.find(JpaWidgetComment.class, source.getId() == null ? null : Long.parseLong(source.getId()));
+ converted = source.getId() == null ? new JpaWidgetComment() : manager.find(JpaWidgetComment.class, Long.parseLong(source.getId()));
if (converted == null) {
converted = new JpaWidgetComment();