return empty list

2 files changed, 6 insertions, 2 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementPoolApi.java b/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementPoolApi.java
index 10d2f00..fec1236 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementPoolApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/EntitlementPoolApi.java
@@ -33,7 +33,6 @@ public class EntitlementPoolApi extends BaseApi {
         return EntitlementPool.class;
     }
     
-    
     @GET
     @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public List<EntitlementPool> list() {
diff --git a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
index 509c6b3..c833b68 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/model/ObjectFactory.java
@@ -93,7 +93,12 @@ public class ObjectFactory {
      * @return List if found. null if not.
      */
     public List<Object> listObjectsByClass(Class<?> clazz) {
-        return (List<Object>) objects.get(clazz.getName());
+        List<Object> retval = null;
+        retval = (List<Object>) objects.get(clazz.getName());
+        if (retval == null) {
+            retval = new LinkedList();
+        }
+        return retval;
     }
 
     /**