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

[mfranklin]

Author: mfranklin
Date: Mon Jun  4 20:00:48 2012
New Revision: 1346127

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

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

Modified: 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java?rev=1346127&r1=1346126&r2=1346127&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverter.java
 Mon Jun  4 20:00:48 2012
@@ -27,19 +27,21 @@ public class JpaOrganizationConverter im
 
     @Override
     public JpaOrganization convert(Organization source) {
-        return source instanceof JpaOrganization ? (JpaOrganization)source : 
createEntity(source);
+        return source instanceof JpaOrganization ? (JpaOrganization) source : 
createEntity(source);
     }
 
     private JpaOrganization createEntity(Organization source) {
-        JpaOrganization converted;
-        TypedQuery<JpaOrganization> query = 
manager.createNamedQuery(JpaOrganization.FIND_BY_NAME, JpaOrganization.class);
-        query.setParameter(JpaOrganization.NAME_PARAM, source.getName());
-        converted = getSingleResult(query.getResultList());
+        JpaOrganization converted = null;
+        if (source != null) {
+            TypedQuery<JpaOrganization> query = 
manager.createNamedQuery(JpaOrganization.FIND_BY_NAME, JpaOrganization.class);
+            query.setParameter(JpaOrganization.NAME_PARAM, source.getName());
+            converted = getSingleResult(query.getResultList());
 
-        if(converted == null) {
-            converted = new JpaOrganization();
+            if (converted == null) {
+                converted = new JpaOrganization();
+            }
+            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/JpaOrganizationConverterTest.java
URL: 
http://svn.apache.org/viewvc/rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java?rev=1346127&r1=1346126&r2=1346127&view=diff
==============================================================================
--- 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java
 (original)
+++ 
rave/branches/model_interfaces/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/conversion/JpaOrganizationConverterTest.java
 Mon Jun  4 20:00:48 2012
@@ -32,6 +32,13 @@ public class JpaOrganizationConverterTes
     }
 
     @Test
+    public void nullConversion() {
+        Organization template = null;
+        assertThat(converter.convert(template), is(nullValue()));
+    }
+
+
+    @Test
     public void convertValid() {
         Organization template = new OrganizationImpl();