From 9a477064dc8da2dbea8e2da2bfa793e190f7622b Mon Sep 17 00:00:00 2001 From: "Timothy A. Bish" Date: Tue, 2 Dec 2014 19:47:50 +0000 Subject: https://issues.apache.org/jira/browse/QPID-6100 Refine the exception message and throw a JMSSecurityException as defined by the spec and to make tests more explicit about what they are expecting. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1642996 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java index b69f38b801..6ab6d22a65 100644 --- a/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java +++ b/qpid/java/amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/impl/ConnectionImpl.java @@ -29,6 +29,7 @@ import javax.jms.Destination; import javax.jms.ExceptionListener; import javax.jms.IllegalStateException; import javax.jms.JMSException; +import javax.jms.JMSSecurityException; import javax.jms.Queue; import javax.jms.QueueConnection; import javax.jms.QueueSession; @@ -186,7 +187,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect } else if(_conn.getEndpoint().requiresSASL() && !_conn.getEndpoint().isAuthenticated()) { - throw new JMSException("Authentication Failed"); + throw new JMSSecurityException("Failed to authenitcate user[" + _username + "]."); } } catch (ConnectionException e) @@ -264,7 +265,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect { session.setMaxPrefetch(_maxPrefetch); } - + boolean connectionStarted = false; synchronized(_lock) { @@ -272,12 +273,12 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect _sessions.add(session); connectionStarted = _state == State.STARTED; } - + if(connectionStarted) { session.start(); } - + return session; } catch(JMSException e) @@ -402,7 +403,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect _lock.notifyAll(); } - + if (startedSessions != null) { for(SessionImpl session : startedSessions) @@ -449,7 +450,7 @@ public class ConnectionImpl implements Connection, QueueConnection, TopicConnect closeTasks = new ArrayList(_closeTasks); closeConnection = _conn != null && _state != State.UNCONNECTED; } - + _lock.notifyAll(); } -- cgit v1.2.1