killbill-memoizeit

jaxrs: fix NPE in NotificationJson In some cases, accountId

6/28/2013 12:49:24 AM

Details

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/NotificationJson.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/NotificationJson.java
index 87c1a66..85aa6f6 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/json/NotificationJson.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/json/NotificationJson.java
@@ -33,21 +33,22 @@ public class NotificationJson {
 
     @JsonCreator
     public NotificationJson(@JsonProperty("eventType") final String eventType,
-            @JsonProperty("accountId") final String accountId,
-            @JsonProperty("objectType") final String objectType,
-            @JsonProperty("objectId") final String objectId) {
+                            @JsonProperty("accountId") final String accountId,
+                            @JsonProperty("objectType") final String objectType,
+                            @JsonProperty("objectId") final String objectId) {
         this.eventType = eventType;
         this.accountId = accountId;
         this.objectType = objectType;
         this.objectId = objectId;
     }
 
-
     public NotificationJson(final ExtBusEvent event) {
-        this(event.getEventType().toString(), event.getAccountId().toString(), event.getObjectType().toString(), event.getObjectId() != null ?  event.getObjectId().toString() : null);
+        this(event.getEventType().toString(),
+             event.getAccountId() != null ? event.getAccountId().toString() : null,
+             event.getObjectType().toString(),
+             event.getObjectId() != null ? event.getObjectId().toString() : null);
     }
 
-
     public String getEventType() {
         return eventType;
     }