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

[mfranklin]

Author: mfranklin
Date: Mon Jun  4 20:03:44 2012
New Revision: 1346130

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

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

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java?rev=1346130&r1=1346129&r2=1346130&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverter.java
 Mon Jun  4 20:03:44 2012
@@ -42,11 +42,15 @@ public class JpaPageTemplateWidgetConver
     }
 
     private JpaPageTemplateWidget createEntity(PageTemplateWidget source) {
-        JpaPageTemplateWidget converted = 
manager.find(JpaPageTemplateWidget.class, source.getId());
-        if (converted == null) {
-            converted = new JpaPageTemplateWidget();
+        JpaPageTemplateWidget converted = null;
+        if (source != null) {
+            converted = manager.find(JpaPageTemplateWidget.class, 
source.getId());
+
+            if (converted == null) {
+                converted = new JpaPageTemplateWidget();
+            }
+            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/JpaPageTemplateWidgetConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java?rev=1346130&r1=1346129&r2=1346130&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateWidgetConverterTest.java
 Mon Jun  4 20:03:44 2012
@@ -53,6 +53,13 @@ public class JpaPageTemplateWidgetConver
     }
 
     @Test
+    public void nullConversion() {
+        PageTemplateWidget template = null;
+        assertThat(converter.convert(template), is(nullValue()));
+    }
+
+
+    @Test
     public void convertValid() {
         Widget widget = new Widget();
         PageTemplateWidget template = new PageTemplateWidgetImpl();