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:17 UTC

svn commit: r1435292 - /rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java

Author: mfranklin
Date: Fri Jan 18 18:34:17 2013
New Revision: 1435292

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

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

Modified: rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java?rev=1435292&r1=1435291&r2=1435292&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java (original)
+++ rave/trunk/rave-components/rave-jpa/src/main/java/org/apache/rave/portal/model/conversion/JpaOAuthTokenInfoConverter.java Fri Jan 18 18:34:17 2013
@@ -48,10 +48,7 @@ public class JpaOAuthTokenInfoConverter 
     private JpaOAuthTokenInfo createEntity(OAuthTokenInfo source) {
         JpaOAuthTokenInfo converted = null;
         if (source != null) {
-            converted = manager.find(JpaOAuthTokenInfo.class, source.getId() == null ? null : Long.parseLong(source.getId()));
-            if (converted == null) {
-                converted = new JpaOAuthTokenInfo();
-            }
+            converted = source.getId() == null ? new JpaOAuthTokenInfo() : manager.find(JpaOAuthTokenInfo.class, Long.parseLong(source.getId()));
             updateProperties(source, converted);
         }
         return converted;