killbill-memoizeit

jaxrs: fix potential NPE in BusinessInvoiceJson Signed-off-by:

10/31/2012 10:56:51 PM

Details

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoiceJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoiceJson.java
index e7aa77c..5b554eb 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoiceJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/BusinessInvoiceJson.java
@@ -159,7 +159,7 @@ public class BusinessInvoiceJson extends JsonBase {
                  businessInvoiceItem.getEndDate(),
                  businessInvoiceItem.getAmount(),
                  businessInvoiceItem.getCurrency().toString(),
-                 businessInvoiceItem.getLinkedItemId().toString());
+                 businessInvoiceItem.getLinkedItemId() == null ? null : businessInvoiceItem.getLinkedItemId().toString());
         }
 
         public String getItemId() {