svn commit: r1346143 - in /rave/branches/model_interfaces/rave-components/rave-core/src: main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java

[mfranklin]

Author: mfranklin
Date: Mon Jun  4 20:17:05 2012
New Revision: 1346143

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

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

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java?rev=1346143&r1=1346142&r2=1346143&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverter.java
 Mon Jun  4 20:17:05 2012
@@ -24,16 +24,19 @@ public class JpaWidgetRatingConverter im
 
     @Override
     public JpaWidgetRating convert(WidgetRating source) {
-        return source instanceof JpaWidgetRating? (JpaWidgetRating)source : 
createEntity(source);
+        return source instanceof JpaWidgetRating ? (JpaWidgetRating) source : 
createEntity(source);
     }
 
     private JpaWidgetRating createEntity(WidgetRating source) {
-        JpaWidgetRating converted = manager.find(JpaWidgetRating.class, 
source.getId());
+        JpaWidgetRating converted = null;
+        if (source != null) {
+            converted = manager.find(JpaWidgetRating.class, source.getId());
 
-        if(converted == null) {
-            converted = new JpaWidgetRating();
+            if (converted == null) {
+                converted = new JpaWidgetRating();
+            }
+            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/JpaWidgetRatingConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java?rev=1346143&r1=1346142&r2=1346143&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaWidgetRatingConverterTest.java
 Mon Jun  4 20:17:05 2012
@@ -32,6 +32,13 @@ public class JpaWidgetRatingConverterTes
     }
 
     @Test
+    public void nullConversion() {
+        WidgetRating template = null;
+        assertThat(converter.convert(template), is(nullValue()));
+    }
+
+
+    @Test
     public void convertValid() {
         WidgetRating template = new WidgetRatingImpl();