killbill-memoizeit

diff --git a/beatrix/src/main/java/com/ning/billing/beatrix/extbus/PersistentExternalBus.java b/beatrix/src/main/java/com/ning/billing/beatrix/extbus/PersistentExternalBus.java
index 63f1a0a..6a37476 100644
--- a/beatrix/src/main/java/com/ning/billing/beatrix/extbus/PersistentExternalBus.java
+++ b/beatrix/src/main/java/com/ning/billing/beatrix/extbus/PersistentExternalBus.java
@@ -64,20 +64,6 @@ public class PersistentExternalBus extends PersistentQueueBase implements Extern
         public EventBusDelegate(final String busName) {
             super(busName);
         }
-
-        // STEPH we can't override the method because EventHandler is package private scope
-        // Logged a bug against guava (Issue 981)
-        /*
-        @Override
-        protected void dispatch(Object event, EventHandler wrapper) {
-            try {
-              wrapper.handleEvent(event);
-            } catch (InvocationTargetException e) {
-              logger.log(Level.SEVERE,
-                  "Could not dispatch event: " + event + " to handler " + wrapper, e);
-            }
-          }
-         */
     }
 
     @Inject
@@ -160,7 +146,7 @@ public class PersistentExternalBus extends PersistentQueueBase implements Extern
         eventBusDelegate.unregister(handlerInstance);
     }
 
-    public void post(final ExtBusEventEntry event, InternalCallContext context) throws EventBusException{
+    public void post(final ExtBusEventEntry event, final InternalCallContext context) throws EventBusException{
         dao.insertBusExtEvent(event, context);
     }
 }

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 762a184..9ddb2b8 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
@@ -44,7 +44,8 @@ public class NotificationJson {
 
 
     public NotificationJson(final ExtBusEvent event) {
-        this(event.getEventType().toString(), event.getAccountId().toString(), event.getObjectType().toString(), event.getObjectId().toString());
+        // API_FIX accountId NULL
+        this(event.getEventType().toString(), null /* event.getAccountId().toString() */, event.getObjectType().toString(), event.getObjectId().toString());
     }