summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/client/src/main')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
index 2775354acf..e9b946d5b7 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/transport/ClientConnectionDelegate.java
@@ -98,7 +98,8 @@ public class ClientConnectionDelegate extends ClientDelegate
" Client restricted itself to : " + (restrictionList != null ? restrictionList : "no restriction"));
}
- if (CallbackHandlerRegistry.getInstance().isUserPassRequired(selectedMech))
+ if ((_connectionURL.getUsername() == null || _connectionURL.getPassword() == null)
+ && CallbackHandlerRegistry.getInstance().isUserPassRequired(selectedMech))
{
throw new ConnectionException("Username and Password is required for the selected mechanism : " + selectedMech +
" Broker allows : " + brokerMechanisms +