Author: mfranklin
Date: Fri Jan 18 18:34:03 2013
New Revision: 1435290
URL: http://svn.apache.org/viewvc?rev=1435290&view=rev
Log:
Updated Category converters to be eclipselink compatible RAVE-875
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
Modified:
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java?rev=1435290&r1=1435289&r2=1435290&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
(original)
+++
rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
Fri Jan 18 18:34:03 2013
@@ -48,10 +48,7 @@ public class JpaCategoryConverter implem
private JpaCategory createEntity(Category source) {
JpaCategory converted = null;
if (source != null) {
- converted = manager.find(JpaCategory.class, source.getId() == null
? null : Long.parseLong(source.getId()));
- if (converted == null) {
- converted = new JpaCategory();
- }
+ converted = source.getId() == null ? new JpaCategory() :
manager.find(JpaCategory.class, Long.parseLong(source.getId()));
updateProperties(source, converted);
}
return converted;