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

[mfranklin]

Author: mfranklin
Date: Mon Jun  4 19:58:47 2012
New Revision: 1346123

URL: http://svn.apache.org/viewvc?rev=1346123&view=rev
Log:
Fixed NPE in conversion (RAVE-625)

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

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java?rev=1346123&r1=1346122&r2=1346123&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaCategoryConverter.java
 Mon Jun  4 19:58:47 2012
@@ -42,15 +42,18 @@ public class JpaCategoryConverter implem
 
     @Override
     public JpaCategory convert(Category source) {
-        return source instanceof JpaCategory ? (JpaCategory)source : 
createEntity(source);
+        return source instanceof JpaCategory ? (JpaCategory) source : 
createEntity(source);
     }
 
     private JpaCategory createEntity(Category source) {
-        JpaCategory converted = manager.find(JpaCategory.class, 
source.getId());
-        if(converted == null) {
-            converted = new JpaCategory();
+        JpaCategory converted = null;
+        if (source != null) {
+            converted = manager.find(JpaCategory.class, source.getId());
+            if (converted == null) {
+                converted = new JpaCategory();
+            }
+            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/JpaCategoryConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java?rev=1346123&r1=1346122&r2=1346123&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaCategoryConverterTest.java
 Mon Jun  4 19:58:47 2012
@@ -46,6 +46,12 @@ public class JpaCategoryConverterTest {
     }
 
     @Test
+    public void nullConversion() {
+        Category category = null;
+        assertThat(categoryConverter.convert(category), is(nullValue()));
+    }
+
+    @Test
     public void newCategory() {
         Category category = new CategoryImpl();
         category.setCreatedDate(new Date());