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 2012/06/04 22:02:19 UTC
svn commit: r1346129 - 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/

Author: mfranklin
Date: Mon Jun  4 20:02:19 2012
New Revision: 1346129

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

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

Modified: rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java?rev=1346129&r1=1346128&r2=1346129&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverter.java Mon Jun  4 20:02:19 2012
@@ -42,13 +42,16 @@ public class JpaPageTemplateRegionConver
     }
 
     private JpaPageTemplateRegion createEntity(PageTemplateRegion source) {
-        JpaPageTemplateRegion converted = manager.find(JpaPageTemplateRegion.class, source.getId());
+        JpaPageTemplateRegion converted = null;
 
-        if (converted == null) {
-            converted = new JpaPageTemplateRegion();
-        }
-        updateProperties(source, converted);
+        if (source != null) {
+            converted = manager.find(JpaPageTemplateRegion.class, source.getId());
 
+            if (converted == null) {
+                converted = new JpaPageTemplateRegion();
+            }
+            updateProperties(source, converted);
+        }
         return converted;
     }
 

Modified: rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java?rev=1346129&r1=1346128&r2=1346129&view=diff
==============================================================================
--- rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java (original)
+++ rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaPageTemplateRegionConverterTest.java Mon Jun  4 20:02:19 2012
@@ -55,6 +55,13 @@ public class JpaPageTemplateRegionConver
     }
 
     @Test
+    public void nullConversion() {
+        PageTemplateRegion template = null;
+        assertThat(converter.convert(template), is(nullValue()));
+    }
+
+
+    @Test
     public void convertValid() {
         PageTemplateRegion template = new PageTemplateRegionImpl();
         template.setRenderSequence(1);