killbill-uncached

osgi, osgi-bundles: trivial fixes Signed-off-by: Pierre-Alexandre

3/25/2013 8:34:39 PM

Details

diff --git a/osgi/src/main/java/com/ning/billing/osgi/FileInstall.java b/osgi/src/main/java/com/ning/billing/osgi/FileInstall.java
index 6fb5bd9..51899a0 100644
--- a/osgi/src/main/java/com/ning/billing/osgi/FileInstall.java
+++ b/osgi/src/main/java/com/ning/billing/osgi/FileInstall.java
@@ -105,11 +105,6 @@ public class FileInstall {
         }
 
         final List<PluginRubyConfig> pluginRubyConfigs = pluginFinder.getLatestRubyPlugins();
-        if (pluginRubyConfigs.size() > 0 && jrubyBundlePath == null) {
-            logger.warn("Unable to find the JRuby bundle for ruby plugins");
-            return;
-        }
-
         for (final PluginRubyConfig cur : pluginRubyConfigs) {
             logger.info("Installing JRuby bundle for plugin {} from {}", cur.getPluginName(), cur.getRubyLoadDir());
             final Bundle bundle = context.installBundle("file:" + jrubyBundlePath);
@@ -135,7 +130,6 @@ public class FileInstall {
             logger.info("Skipping fragment bundle {}", bundle.getLocation());
         } else {
             logger.info("Starting bundle {}", bundle.getLocation());
-            final ClassLoader previousClassLoader = Thread.currentThread().getContextClassLoader();
             try {
                 bundle.start();
                 return true;
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 53a7ea4..e7bf01e 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
@@ -51,7 +51,7 @@ public class TestActivator extends KillbillActivatorBase implements OSGIKillbill
     public void start(final BundleContext context) throws Exception {
 
         final String bundleName = context.getBundle().getSymbolicName();
-        System.out.println("TestActivator starting bundle = " + bundleName);
+        logService.log(LogService.LOG_INFO, "TestActivator starting bundle = " + bundleName);
 
         super.start(context);