killbill-memoizeit

jaxrs: make sure not to write null entities in the JSON bodies Signed-off-by:

7/8/2014 12:19:51 PM

Details

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
index cea1612..da2605d 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/JaxRsResourceBase.java
@@ -258,7 +258,10 @@ public abstract class JaxRsResourceBase implements JaxrsResource {
 
                 generator.writeStartArray();
                 for (final E entity : entities) {
-                    generator.writeObject(toJson.apply(entity));
+                    final J asJson = toJson.apply(entity);
+                    if (asJson != null) {
+                        generator.writeObject(asJson);
+                    }
                 }
                 generator.writeEndArray();
                 generator.close();