summaryrefslogtreecommitdiff
path: root/java/broker-plugins/extras/src
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2011-08-21 15:31:17 +0000
committerRobert Gemmell <robbie@apache.org>2011-08-21 15:31:17 +0000
commit84dbd5de79d3bda6a1536fc49d3c2c8314c3599f (patch)
treecef2e7c96e4b17666841846abc999e675e7a2285 /java/broker-plugins/extras/src
parent00890b2657ac09fae32e3b18b78e643fcd29deed (diff)
downloadqpid-python-84dbd5de79d3bda6a1536fc49d3c2c8314c3599f.tar.gz
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/qpid@1160000 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker-plugins/extras/src')
-rw-r--r--java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java b/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
index 57b6e19b5d..db3ebfd4e1 100644
--- a/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java
+++ b/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<String, ExchangeType<?>> exchanges = manager.getExchanges();
assertTrue("Exchanges found", exchanges.isEmpty());
}