From 7f80f11a422d9f9fe54012a6ea5e6eba8de03d61 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Sun, 21 Aug 2011 15:31:17 +0000 Subject: QPID-2720: make the PluginManager able to work with a pre-existing BundleContext Manually applied patch from Danushka Menikkumbura (no longer applied after intervening commits), then updated PluginManager close() to always close the ServiceTrackers it creates, removed the static field/methods causing test failures which lead to previously reverting the patch, enabled passing a pre existing BundleContext into the Broker instance at startup instead, and finally removed the unused MockPluginManager. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1160000 13f79535-47bb-0310-9956-ffa450edef68 --- .../extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qpid/java/broker-plugins/extras/src') diff --git a/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java index 57b6e19b5d..db3ebfd4e1 100644 --- a/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java +++ b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java @@ -67,7 +67,7 @@ public class ExtrasTest extends TestCase public void testNoExchanges() throws Exception { - PluginManager manager = new PluginManager("/path/to/nowhere", "/tmp"); + PluginManager manager = new PluginManager("/path/to/nowhere", "/tmp", null); Map> exchanges = manager.getExchanges(); assertTrue("Exchanges found", exchanges.isEmpty()); } -- cgit v1.2.1