killbill-aplcache

diff --git a/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/KillbillActivatorBase.java b/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/KillbillActivatorBase.java
index ec729ca..bd2056f 100644
--- a/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/KillbillActivatorBase.java
+++ b/osgi-bundles/libs/killbill/src/main/java/com/ning/killbill/osgi/libs/killbill/KillbillActivatorBase.java
@@ -21,20 +21,20 @@ import org.osgi.framework.BundleContext;
 
 import com.ning.killbill.osgi.libs.killbill.OSGIKillbillEventDispatcher.OSGIKillbillEventHandler;
 
-public abstract class KillbillActivatorBase implements BundleActivator, OSGIKillbillEventHandler {
+public abstract class KillbillActivatorBase implements BundleActivator {
 
 
-    protected OSGIKillbillAPI api;
+    protected OSGIKillbillAPI killbillAPI;
     protected OSGIKillbillLogService logService;
     protected OSGIKillbillRegistrar registrar;
     protected OSGIKillbillDataSource dataSource;
     protected OSGIKillbillEventDispatcher dispatcher;
 
     @Override
-    public void start(final BundleContext context) {
+    public void start(final BundleContext context) throws Exception {
 
         // Tracked resource
-        api = new OSGIKillbillAPI(context);
+        killbillAPI = new OSGIKillbillAPI(context);
         logService = new OSGIKillbillLogService(context);
         dataSource = new OSGIKillbillDataSource(context);
         dispatcher = new OSGIKillbillEventDispatcher(context);
@@ -45,15 +45,15 @@ public abstract class KillbillActivatorBase implements BundleActivator, OSGIKill
         // Killbill events
         final OSGIKillbillEventHandler handler = getOSGIKillbillEventHandler();
         if (handler != null) {
-            dispatcher.registerEventHandler(this);
+            dispatcher.registerEventHandler(handler);
         }
     }
 
     @Override
-    public void stop(final BundleContext context) {
+    public void stop(final BundleContext context) throws Exception {
 
         // Close trackers
-        api.close();
+        killbillAPI.close();
         dispatcher.close();
         dataSource.close();
         logService.close();

diff --git a/osgi-bundles/tests/beatrix/src/test/java/com/ning/billing/osgi/bundles/test/TestActivator.java b/osgi-bundles/tests/beatrix/src/test/java/com/ning/billing/osgi/bundles/test/TestActivator.java
index 78559e6..53a7ea4 100644
--- a/osgi-bundles/tests/beatrix/src/test/java/com/ning/billing/osgi/bundles/test/TestActivator.java
+++ b/osgi-bundles/tests/beatrix/src/test/java/com/ning/billing/osgi/bundles/test/TestActivator.java
@@ -48,7 +48,7 @@ public class TestActivator extends KillbillActivatorBase implements OSGIKillbill
     private TestDao testDao;
 
     @Override
-    public void start(final BundleContext context) {
+    public void start(final BundleContext context) throws Exception {
 
         final String bundleName = context.getBundle().getSymbolicName();
         System.out.println("TestActivator starting bundle = " + bundleName);
@@ -64,7 +64,7 @@ public class TestActivator extends KillbillActivatorBase implements OSGIKillbill
     }
 
     @Override
-    public void stop(final BundleContext context) {
+    public void stop(final BundleContext context) throws Exception {
         super.stop(context);
         System.out.println("Good bye world from TestActivator!");
     }
@@ -75,7 +75,6 @@ public class TestActivator extends KillbillActivatorBase implements OSGIKillbill
     }
 
     private void registerPaymentApi(final BundleContext context, final TestDao dao) {
-
         final Dictionary props = new Hashtable();
         props.put(OSGIPluginProperties.PLUGIN_NAME_PROP, "test");
         registrar.registerService(context, PaymentPluginApi.class, new TestPaymentPluginApi("test", dao), props);
@@ -99,12 +98,11 @@ public class TestActivator extends KillbillActivatorBase implements OSGIKillbill
         };
 
         try {
-            Account account = api.getAccountUserApi().getAccountById(killbillEvent.getAccountId(), tenantContext);
+            Account account = killbillAPI.getAccountUserApi().getAccountById(killbillEvent.getAccountId(), tenantContext);
             testDao.insertAccountExternalKey(account.getExternalKey());
 
         } catch (AccountApiException e) {
             logService.log(LogService.LOG_ERROR, e.getMessage());
         }
     }
-
 }