svn commit: r1346140 - in /rave/branches/model_interfaces/rave-components/rave-core/src: main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java

[mfranklin]

Author: mfranklin
Date: Mon Jun  4 20:14:32 2012
New Revision: 1346140

URL: http://svn.apache.org/viewvc?rev=1346140&view=rev
Log:
Fixed failing WidgetComment NPE conversion test (RAVE-625)

Modified:
    
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
    
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java?rev=1346140&r1=1346139&r2=1346140&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverter.java
 Mon Jun  4 20:14:32 2012
@@ -19,8 +19,6 @@
 package org.apache.rave.portal.model.conversion;
 
 import org.apache.rave.model.ModelConverter;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.JpaCategory;
 import org.apache.rave.portal.model.JpaWidgetComment;
 import org.apache.rave.portal.model.WidgetComment;
 import org.springframework.stereotype.Component;
@@ -44,15 +42,19 @@ public class JpaWidgetCommentConverter i
 
     @Override
     public JpaWidgetComment convert(WidgetComment source) {
-        return source instanceof JpaWidgetComment ? (JpaWidgetComment)source : 
createEntity(source);
+        return source instanceof JpaWidgetComment ? (JpaWidgetComment) source 
: createEntity(source);
     }
 
     private JpaWidgetComment createEntity(WidgetComment source) {
-        JpaWidgetComment converted = manager.find(JpaWidgetComment.class, 
source.getId());
-        if(converted == null) {
-            converted = new JpaWidgetComment();
+        JpaWidgetComment converted = null;
+        if (source != null) {
+            converted = manager.find(JpaWidgetComment.class, source.getId());
+
+            if (converted == null) {
+                converted = new JpaWidgetComment();
+            }
+            updateProperties(source, converted);
         }
-        updateProperties(source, converted);
         return converted;
     }
 

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java?rev=1346140&r1=1346139&r2=1346140&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetCommentConverterTest.java
 Mon Jun  4 20:14:32 2012
@@ -47,6 +47,13 @@ public class JpaWidgetCommentConverterTe
     }
 
     @Test
+    public void nullConversion() {
+        WidgetComment template = null;
+        assertThat(widgetCommentConverter.convert(template), is(nullValue()));
+    }
+
+
+    @Test
     public void newComment() {
         WidgetComment comment = new WidgetCommentImpl();
         comment.setCreatedDate(new Date());