Repository: activemq Updated Branches: refs/heads/master 1de7e7e8a -> 5009b0c03
https://issues.apache.org/jira/browse/AMQ-6247 Allow the provider position to be read from the system. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/5009b0c0 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/5009b0c0 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/5009b0c0 Branch: refs/heads/master Commit: 5009b0c03bababa26f3b819dc0d3688d0d13af1a Parents: 1de7e7e Author: Timothy Bish <[email protected]> Authored: Fri May 6 09:37:51 2016 -0400 Committer: Timothy Bish <[email protected]> Committed: Fri May 6 09:37:51 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/broker/BrokerService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/5009b0c0/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java index b9d8842..77f0993 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -273,7 +273,8 @@ public class BrokerService implements Service { ClassLoader loader = BrokerService.class.getClassLoader(); Class<?> clazz = loader.loadClass("org.bouncycastle.jce.provider.BouncyCastleProvider"); Provider bouncycastle = (Provider) clazz.newInstance(); - Security.insertProviderAt(bouncycastle, 2); + Security.insertProviderAt(bouncycastle, + Integer.getInteger("org.apache.activemq.broker.BouncyCastlePosition", 2)); LOG.info("Loaded the Bouncy Castle security provider."); } catch(Throwable e) { // No BouncyCastle found so we use the default Java Security Provider
