summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-02-05 12:34:29 +0000
committerKeith Wall <kwall@apache.org>2015-02-05 12:34:29 +0000
commitd3f445a199c0ed050bd4fa4bc00f331111a7a64d (patch)
tree1bd043a861b0c4d6ee1f4e069d6fc93a56969bc5 /qpid/java
parentce525e6c5e1df021c0e3f303bbdc078a678b0f54 (diff)
downloadqpid-python-d3f445a199c0ed050bd4fa4bc00f331111a7a64d.tar.gz
QPID-6363: [Java Client] Register SASL mechanisms early
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1657555 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
index 70d91ad817..df55080f67 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
@@ -64,6 +64,7 @@ import org.apache.qpid.AMQUnresolvedAddressException;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.failover.FailoverProtectedOperation;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.security.CallbackHandlerRegistry;
import org.apache.qpid.client.state.AMQStateManager;
import org.apache.qpid.configuration.ClientProperties;
import org.apache.qpid.exchange.ExchangeDefaults;
@@ -192,6 +193,17 @@ public class AMQConnection extends Closeable implements Connection, QueueConnect
private boolean _compressMessages;
private int _messageCompressionThresholdSize;
+ static
+ {
+ // The registering of any additional SASL mechanisms with the Java Security API requires
+ // SecurityManager permissions. In execution environments such as web containers,
+ // this may require adjustments to the Java security.policy.
+ CallbackHandlerRegistry registry = CallbackHandlerRegistry.getInstance();
+ if (_logger.isDebugEnabled())
+ {
+ _logger.debug("Loaded mechanisms " + registry.getMechanisms());
+ }
+ }
/**
* @param broker brokerdetails
* @param username username