Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java Wed Jul 8 13:50:16 2015 @@ -29,7 +29,7 @@ import javax.jms.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.failover.FailoverException; import org.apache.qpid.client.message.AMQMessageDelegateFactory; import org.apache.qpid.client.message.AbstractJMSMessage; @@ -115,7 +115,7 @@ public class BasicMessageConsumer_0_8 ex return (AMQSession_0_8) super.getSession(); } - void sendCancel() throws AMQException, FailoverException + void sendCancel() throws QpidException, FailoverException { BasicCancelBody body = getSession().getMethodRegistry().createBasicCancelBody(new AMQShortString(String.valueOf(getConsumerTag())), false); @@ -130,7 +130,7 @@ public class BasicMessageConsumer_0_8 ex } } - void postSubscription() throws AMQException + void postSubscription() throws QpidException { AMQDestination dest = this.getDestination(); if (dest != null && dest.getDestSyntax() == AMQDestination.DestSyntax.ADDR) @@ -200,7 +200,7 @@ public class BasicMessageConsumer_0_8 ex } return message; } - catch (AMQException e) + catch (QpidException e) { throw JMSExceptionHelper.chainJMSException(new JMSException("BasicMessageConsumer.receive failed."), e); } @@ -233,7 +233,7 @@ public class BasicMessageConsumer_0_8 ex } return message; } - catch (AMQException e) + catch (QpidException e) { throw JMSExceptionHelper.chainJMSException(new JMSException("BasicMessageConsumer.receiveNoWait failed"), e);
Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java Wed Jul 8 13:50:16 2015 @@ -36,7 +36,7 @@ import javax.jms.Topic; import org.slf4j.Logger; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.message.AbstractJMSMessage; import org.apache.qpid.client.message.MessageConverter; import org.apache.qpid.client.util.JMSExceptionHelper; @@ -126,7 +126,8 @@ public abstract class BasicMessageProduc private PublishMode _publishMode = PublishMode.ASYNC_PUBLISH_ALL; protected BasicMessageProducer(Logger logger,AMQConnection connection, AMQDestination destination, boolean transacted, int channelId, - AMQSession session, long producerId, Boolean immediate, Boolean mandatory) throws AMQException + AMQSession session, long producerId, Boolean immediate, Boolean mandatory) throws + QpidException { _logger = logger; _connection = connection; @@ -179,7 +180,7 @@ public abstract class BasicMessageProduc } } - void resubscribe() throws AMQException + void resubscribe() throws QpidException { if (_destination != null && !_destination.neverDeclare()) { @@ -187,7 +188,7 @@ public abstract class BasicMessageProduc } } - abstract void declareDestination(AMQDestination destination) throws AMQException; + abstract void declareDestination(AMQDestination destination) throws QpidException; public void setDisableMessageID(boolean b) throws JMSException { @@ -307,7 +308,7 @@ public abstract class BasicMessageProduc { throw getSession().toJMSException("Exception while closing producer:" + e.getMessage(), e); } - catch (AMQException e) + catch (QpidException e) { throw JMSExceptionHelper.chainJMSException(new JMSException("Exception while closing producer:" + e.getMessage()), e); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java Wed Jul 8 13:50:16 2015 @@ -40,7 +40,7 @@ import javax.jms.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.AMQDestination.DestSyntax; import org.apache.qpid.client.message.AMQMessageDelegate_0_10; import org.apache.qpid.client.message.AbstractJMSMessage; @@ -72,14 +72,15 @@ public class BasicMessageProducer_0_10 e private byte[] userIDBytes; BasicMessageProducer_0_10(AMQConnection connection, AMQDestination destination, boolean transacted, int channelId, - AMQSession session, long producerId, Boolean immediate, Boolean mandatory) throws AMQException + AMQSession session, long producerId, Boolean immediate, Boolean mandatory) throws + QpidException { super(_logger, connection, destination, transacted, channelId, session, producerId, immediate, mandatory); userIDBytes = Strings.toUTF8(getUserID()); } - void declareDestination(AMQDestination destination) throws AMQException + void declareDestination(AMQDestination destination) throws QpidException { if (destination.getDestSyntax() == DestSyntax.BURL) { @@ -105,7 +106,7 @@ public class BasicMessageProducer_0_10 e } catch(Exception e) { - AMQException ex = new AMQException("Exception occured while verifying destination",e); + QpidException ex = new QpidException("Exception occured while verifying destination",e); throw ex; } } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java Wed Jul 8 13:50:16 2015 @@ -37,7 +37,7 @@ import javax.jms.Topic; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.failover.FailoverException; import org.apache.qpid.client.message.AMQMessageDelegate_0_8; import org.apache.qpid.client.message.AbstractJMSMessage; @@ -69,12 +69,13 @@ public class BasicMessageProducer_0_8 ex private static final boolean SET_EXPIRATION_AS_TTL = Boolean.getBoolean(ClientProperties.SET_EXPIRATION_AS_TTL); BasicMessageProducer_0_8(AMQConnection connection, AMQDestination destination, boolean transacted, int channelId, - AMQSession session, AMQProtocolHandler protocolHandler, long producerId, Boolean immediate, Boolean mandatory) throws AMQException + AMQSession session, AMQProtocolHandler protocolHandler, long producerId, Boolean immediate, Boolean mandatory) throws + QpidException { super(_logger,connection, destination,transacted,channelId,session, producerId, immediate, mandatory); } - void declareDestination(AMQDestination destination) throws AMQException + void declareDestination(AMQDestination destination) throws QpidException { if (destination.getDestSyntax() == AMQDestination.DestSyntax.ADDR) @@ -364,7 +365,7 @@ public class BasicMessageProducer_0_8 ex throw new JMSException("The message was not accepted by the server (e.g. because the address was no longer valid)"); } } - catch (AMQException e) + catch (QpidException e) { throw JMSExceptionHelper.chainJMSException(new JMSException(e.getMessage()), e); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/PooledConnectionFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/PooledConnectionFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/PooledConnectionFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/PooledConnectionFactory.java Wed Jul 8 13:50:16 2015 @@ -55,7 +55,7 @@ import javax.naming.StringRefAddr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.util.JMSExceptionHelper; import org.apache.qpid.jms.*; import org.apache.qpid.url.URLSyntaxException; @@ -246,14 +246,14 @@ public class PooledConnectionFactory imp } return proxyConnection(underlying, identity); } - catch (AMQException e) + catch (QpidException e) { throw JMSExceptionHelper.chainJMSException(new JMSException("Error creating connection: " + e.getMessage()), e); } } - protected CommonConnection newConnectionInstance(final ConnectionURL connectionDetails) throws AMQException + protected CommonConnection newConnectionInstance(final ConnectionURL connectionDetails) throws QpidException { return new AMQConnection(connectionDetails); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java Wed Jul 8 13:50:16 2015 @@ -26,7 +26,7 @@ import javax.jms.MessageListener; import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; /** * Wraps a MessageConsumer to fulfill the extended TopicSubscriber contract @@ -126,7 +126,7 @@ class TopicSubscriberAdaptor<C extends B return _consumer; } - public void addBindingKey(Topic topic, String bindingKey) throws AMQException + public void addBindingKey(Topic topic, String bindingKey) throws QpidException { _consumer.addBindingKey((AMQDestination) topic, bindingKey); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java Wed Jul 8 13:50:16 2015 @@ -17,7 +17,7 @@ */ package org.apache.qpid.client; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.jms.ConnectionURL; import javax.jms.JMSException; @@ -37,7 +37,7 @@ public class XAConnectionImpl extends AM /** * Create a XAConnection from a connectionURL */ - public XAConnectionImpl(ConnectionURL connectionURL) throws AMQException + public XAConnectionImpl(ConnectionURL connectionURL) throws QpidException { super(connectionURL); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XASessionImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XASessionImpl.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XASessionImpl.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XASessionImpl.java Wed Jul 8 13:50:16 2015 @@ -17,7 +17,7 @@ */ package org.apache.qpid.client; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import javax.jms.JMSException; import javax.jms.QueueSession; @@ -193,7 +193,7 @@ public class XASessionImpl extends AMQSe } @Override - void resubscribe() throws AMQException + void resubscribe() throws QpidException { super.resubscribe(); createSession(); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java Wed Jul 8 13:50:16 2015 @@ -20,9 +20,9 @@ */ package org.apache.qpid.client.failover; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; -public class ConnectionRedirectException extends AMQException +public class ConnectionRedirectException extends QpidException { private final String _host; private final int _port; Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -24,7 +24,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.AccessRequestOkBody; @@ -41,7 +41,7 @@ public class AccessRequestOkMethodHandle } public void methodReceived(AMQProtocolSession session, AccessRequestOkBody method, int channelId) - throws AMQException + throws QpidException { _logger.debug("AccessRequestOk method received"); session.setTicket(method.getTicket(), channelId); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.BasicCancelOkBody; @@ -43,7 +43,7 @@ public class BasicCancelOkMethodHandler { } public void methodReceived(AMQProtocolSession session, BasicCancelOkBody body, int channelId) - throws AMQException + throws QpidException { if (_logger.isInfoEnabled()) { Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.message.UnprocessedMessage_0_8; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; @@ -41,7 +41,7 @@ public class BasicDeliverMethodHandler i } public void methodReceived(AMQProtocolSession session, BasicDeliverBody body, int channelId) - throws AMQException + throws QpidException { final UnprocessedMessage_0_8 msg = new UnprocessedMessage_0_8( body.getDeliveryTag(), Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.message.ReturnMessage; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; @@ -42,7 +42,7 @@ public class BasicReturnMethodHandler im public void methodReceived(AMQProtocolSession session, BasicReturnBody body, int channelId) - throws AMQException + throws QpidException { _logger.debug("New JmsBounce method received"); final ReturnMessage msg = new ReturnMessage( Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.AMQChannelClosedException; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.AMQInvalidRoutingKeyException; import org.apache.qpid.client.AMQNoConsumersException; import org.apache.qpid.client.AMQNoRouteException; @@ -48,7 +48,7 @@ public class ChannelCloseMethodHandler i } public void methodReceived(AMQProtocolSession session, ChannelCloseBody method, int channelId) - throws AMQException + throws QpidException { _logger.debug("ChannelClose method received"); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.ChannelCloseOkBody; @@ -41,7 +41,7 @@ public class ChannelCloseOkMethodHandler } public void methodReceived(AMQProtocolSession session, ChannelCloseOkBody method, int channelId) - throws AMQException + throws QpidException { _logger.info("Received channel-close-ok for channel-id " + channelId); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.ChannelFlowBody; @@ -43,7 +43,7 @@ public class ChannelFlowMethodHandler im { } public void methodReceived(AMQProtocolSession session, ChannelFlowBody body, int channelId) - throws AMQException + throws QpidException { session.setFlowControl(channelId, body.getActive()); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.ChannelFlowOkBody; @@ -42,7 +42,7 @@ public class ChannelFlowOkMethodHandler { } public void methodReceived(AMQProtocolSession session, ChannelFlowOkBody body, int channelId) - throws AMQException + throws QpidException { _logger.debug("Received Channel.Flow-Ok message, active = " + body.getActive()); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java Wed Jul 8 13:50:16 2015 @@ -26,7 +26,7 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.AMQMethodNotImplementedException; import org.apache.qpid.client.state.AMQStateManager; @@ -121,14 +121,14 @@ public class ClientMethodDispatcherImpl return _session.getStateManager(); } - public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws AMQException + public boolean dispatchAccessRequestOk(AccessRequestOkBody body, int channelId) throws QpidException { return false; } @Override public boolean dispatchQueueUnbindOk(final QueueUnbindOkBody body, final int channelId) - throws AMQException + throws QpidException { throw new AMQMethodNotImplementedException(body); } @@ -136,151 +136,151 @@ public class ClientMethodDispatcherImpl @Override public boolean dispatchBasicRecoverSyncOk(final BasicRecoverSyncOkBody basicRecoverSyncOkBody, final int channelId) - throws AMQException + throws QpidException { return false; } @Override public boolean dispatchChannelAlert(final ChannelAlertBody channelAlertBody, final int channelId) - throws AMQException + throws QpidException { return false; } @Override public boolean dispatchConfirmSelectOk(final ConfirmSelectOkBody confirmSelectOkBody, final int channelId) - throws AMQException + throws QpidException { return false; } - public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int channelId) throws AMQException + public boolean dispatchBasicCancelOk(BasicCancelOkBody body, int channelId) throws QpidException { _basicCancelOkMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchBasicConsumeOk(BasicConsumeOkBody body, int channelId) throws AMQException + public boolean dispatchBasicConsumeOk(BasicConsumeOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchBasicDeliver(BasicDeliverBody body, int channelId) throws AMQException + public boolean dispatchBasicDeliver(BasicDeliverBody body, int channelId) throws QpidException { _basicDeliverMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchBasicGetEmpty(BasicGetEmptyBody body, int channelId) throws AMQException + public boolean dispatchBasicGetEmpty(BasicGetEmptyBody body, int channelId) throws QpidException { return false; } - public boolean dispatchBasicGetOk(BasicGetOkBody body, int channelId) throws AMQException + public boolean dispatchBasicGetOk(BasicGetOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchBasicQosOk(BasicQosOkBody body, int channelId) throws AMQException + public boolean dispatchBasicQosOk(BasicQosOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws AMQException + public boolean dispatchBasicReturn(BasicReturnBody body, int channelId) throws QpidException { _basicReturnMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws AMQException + public boolean dispatchChannelClose(ChannelCloseBody body, int channelId) throws QpidException { _channelCloseMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws AMQException + public boolean dispatchChannelCloseOk(ChannelCloseOkBody body, int channelId) throws QpidException { _channelCloseOkMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws AMQException + public boolean dispatchChannelFlow(ChannelFlowBody body, int channelId) throws QpidException { _channelFlowMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws AMQException + public boolean dispatchChannelFlowOk(ChannelFlowOkBody body, int channelId) throws QpidException { _channelFlowOkMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchChannelOpenOk(ChannelOpenOkBody body, int channelId) throws AMQException + public boolean dispatchChannelOpenOk(ChannelOpenOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws AMQException + public boolean dispatchConnectionClose(ConnectionCloseBody body, int channelId) throws QpidException { _connectionCloseMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws AMQException + public boolean dispatchConnectionCloseOk(ConnectionCloseOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchConnectionOpenOk(ConnectionOpenOkBody body, int channelId) throws AMQException + public boolean dispatchConnectionOpenOk(ConnectionOpenOkBody body, int channelId) throws QpidException { _connectionOpenOkMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws AMQException + public boolean dispatchConnectionRedirect(ConnectionRedirectBody body, int channelId) throws QpidException { _connectionRedirectMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchConnectionSecure(ConnectionSecureBody body, int channelId) throws AMQException + public boolean dispatchConnectionSecure(ConnectionSecureBody body, int channelId) throws QpidException { _connectionSecureMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchConnectionStart(ConnectionStartBody body, int channelId) throws AMQException + public boolean dispatchConnectionStart(ConnectionStartBody body, int channelId) throws QpidException { _connectionStartMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchConnectionTune(ConnectionTuneBody body, int channelId) throws AMQException + public boolean dispatchConnectionTune(ConnectionTuneBody body, int channelId) throws QpidException { _connectionTuneMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchQueueDeleteOk(QueueDeleteOkBody body, int channelId) throws AMQException + public boolean dispatchQueueDeleteOk(QueueDeleteOkBody body, int channelId) throws QpidException { _queueDeleteOkMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchQueuePurgeOk(QueuePurgeOkBody body, int channelId) throws AMQException + public boolean dispatchQueuePurgeOk(QueuePurgeOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws AMQException + public boolean dispatchAccessRequest(AccessRequestBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } @Override - public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws AMQException + public boolean dispatchBasicAck(BasicAckBody body, int channelId) throws QpidException { return false; } @@ -292,173 +292,173 @@ public class ClientMethodDispatcherImpl } - public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws AMQException + public boolean dispatchBasicCancel(BasicCancelBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws AMQException + public boolean dispatchBasicConsume(BasicConsumeBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws AMQException + public boolean dispatchBasicGet(BasicGetBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws AMQException + public boolean dispatchBasicPublish(BasicPublishBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws AMQException + public boolean dispatchBasicQos(BasicQosBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws AMQException + public boolean dispatchBasicRecover(BasicRecoverBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicReject(BasicRejectBody body, int channelId) throws AMQException + public boolean dispatchBasicReject(BasicRejectBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchChannelOpen(ChannelOpenBody body, int channelId) throws AMQException + public boolean dispatchChannelOpen(ChannelOpenBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws AMQException + public boolean dispatchConnectionOpen(ConnectionOpenBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws AMQException + public boolean dispatchConnectionSecureOk(ConnectionSecureOkBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws AMQException + public boolean dispatchConnectionStartOk(ConnectionStartOkBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws AMQException + public boolean dispatchConnectionTuneOk(ConnectionTuneOkBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws AMQException + public boolean dispatchExchangeBound(ExchangeBoundBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws AMQException + public boolean dispatchExchangeDeclare(ExchangeDeclareBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws AMQException + public boolean dispatchExchangeDelete(ExchangeDeleteBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws AMQException + public boolean dispatchQueueBind(QueueBindBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws AMQException + public boolean dispatchQueueDeclare(QueueDeclareBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws AMQException + public boolean dispatchQueueDelete(QueueDeleteBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws AMQException + public boolean dispatchQueuePurge(QueuePurgeBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws AMQException + public boolean dispatchTxCommit(TxCommitBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws AMQException + public boolean dispatchTxRollback(TxRollbackBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws AMQException + public boolean dispatchTxSelect(TxSelectBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } @Override - public boolean dispatchQueueUnbind(final QueueUnbindBody queueUnbindBody, final int channelId) throws AMQException + public boolean dispatchQueueUnbind(final QueueUnbindBody queueUnbindBody, final int channelId) throws QpidException { return false; } @Override public boolean dispatchBasicRecoverSync(final BasicRecoverSyncBody basicRecoverSyncBody, final int channelId) - throws AMQException + throws QpidException { return false; } @Override - public boolean dispatchConfirmSelect(final ConfirmSelectBody body, final int channelId) throws AMQException + public boolean dispatchConfirmSelect(final ConfirmSelectBody body, final int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws AMQException + public boolean dispatchExchangeBoundOk(ExchangeBoundOkBody body, int channelId) throws QpidException { _exchangeBoundOkMethodHandler.methodReceived(_session, body, channelId); return true; } - public boolean dispatchExchangeDeclareOk(ExchangeDeclareOkBody body, int channelId) throws AMQException + public boolean dispatchExchangeDeclareOk(ExchangeDeclareOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchExchangeDeleteOk(ExchangeDeleteOkBody body, int channelId) throws AMQException + public boolean dispatchExchangeDeleteOk(ExchangeDeleteOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws AMQException + public boolean dispatchQueueBindOk(QueueBindOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchQueueDeclareOk(QueueDeclareOkBody body, int channelId) throws AMQException + public boolean dispatchQueueDeclareOk(QueueDeclareOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws AMQException + public boolean dispatchTxCommitOk(TxCommitOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws AMQException + public boolean dispatchTxRollbackOk(TxRollbackOkBody body, int channelId) throws QpidException { return false; } - public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws AMQException + public boolean dispatchTxSelectOk(TxSelectOkBody body, int channelId) throws QpidException { return false; } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java Wed Jul 8 13:50:16 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.client.handler; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.AMQMethodNotImplementedException; import org.apache.qpid.framing.BasicRecoverSyncBody; @@ -37,29 +37,29 @@ public class ClientMethodDispatcherImpl_ super(session); } - public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException + public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws QpidException { return false; } @Override public boolean dispatchChannelAlert(final ChannelAlertBody body, final int channelId) - throws AMQException + throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException + public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException + public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException + public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws QpidException { return false; } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java Wed Jul 8 13:50:16 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.client.handler; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.AMQMethodNotImplementedException; import org.apache.qpid.framing.BasicRecoverSyncBody; @@ -37,29 +37,29 @@ public class ClientMethodDispatcherImpl_ super(session); } - public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws AMQException + public boolean dispatchBasicRecoverSyncOk(BasicRecoverSyncOkBody body, int channelId) throws QpidException { return false; } @Override public boolean dispatchChannelAlert(final ChannelAlertBody body, final int channelId) - throws AMQException + throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws AMQException + public boolean dispatchBasicRecoverSync(BasicRecoverSyncBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws AMQException + public boolean dispatchQueueUnbind(QueueUnbindBody body, int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } - public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws AMQException + public boolean dispatchQueueUnbindOk(QueueUnbindOkBody body, int channelId) throws QpidException { return false; } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java Wed Jul 8 13:50:16 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.client.handler; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.AMQMethodNotImplementedException; import org.apache.qpid.framing.BasicRecoverSyncBody; @@ -37,7 +37,7 @@ public class ClientMethodDispatcherImpl_ super(session); } - public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws AMQException + public boolean dispatchChannelAlert(ChannelAlertBody body, int channelId) throws QpidException { return false; } @@ -56,14 +56,14 @@ public class ClientMethodDispatcherImpl_ } @Override - public boolean dispatchQueueUnbind(final QueueUnbindBody body, final int channelId) throws AMQException + public boolean dispatchQueueUnbind(final QueueUnbindBody body, final int channelId) throws QpidException { throw new AMQMethodNotImplementedException(body); } @Override public boolean dispatchBasicRecoverSync(final BasicRecoverSyncBody body, final int channelId) - throws AMQException + throws QpidException { throw new AMQMethodNotImplementedException(body); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -24,7 +24,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.qpid.AMQConnectionClosedException; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.AMQSecurityException; import org.apache.qpid.client.AMQAuthenticationException; import org.apache.qpid.client.protocol.AMQProtocolSession; @@ -52,14 +52,14 @@ public class ConnectionCloseMethodHandle } public void methodReceived(AMQProtocolSession session, ConnectionCloseBody method, int channelId) - throws AMQException + throws QpidException { _logger.info("ConnectionClose frame received"); AMQConstant errorCode = AMQConstant.getConstant(method.getReplyCode()); AMQShortString reason = method.getReplyText(); - AMQException error = null; + QpidException error = null; try { Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.failover.ConnectionRedirectException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; @@ -48,7 +48,7 @@ public class ConnectionRedirectMethodHan { } public void methodReceived(AMQProtocolSession session, ConnectionRedirectBody method, int channelId) - throws AMQException + throws QpidException { _logger.info("ConnectionRedirect frame received"); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.client.handler; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.ConnectionSecureBody; @@ -39,12 +39,12 @@ public class ConnectionSecureMethodHandl } public void methodReceived(AMQProtocolSession session, ConnectionSecureBody body, int channelId) - throws AMQException + throws QpidException { SaslClient client = session.getSaslClient(); if (client == null) { - throw new AMQException(null, "No SASL client set up - cannot proceed with authentication", null); + throw new QpidException("No SASL client set up - cannot proceed with authentication", null); } @@ -60,7 +60,7 @@ public class ConnectionSecureMethodHandl } catch (SaslException e) { - throw new AMQException(null, "Error processing SASL challenge: " + e, e); + throw new QpidException("Error processing SASL challenge: " + e, e); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -30,7 +30,7 @@ import javax.security.sasl.SaslException import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.security.AMQCallbackHandler; import org.apache.qpid.client.security.CallbackHandlerRegistry; @@ -65,7 +65,7 @@ public class ConnectionStartMethodHandle @Override public void methodReceived(AMQProtocolSession session, ConnectionStartBody body, int channelId) - throws AMQException + throws QpidException { _log.debug("public void methodReceived(AMQStateManager stateManager, AMQProtocolSession protocolSession, " + "AMQMethodEvent evt): called"); @@ -100,7 +100,7 @@ public class ConnectionStartMethodHandle if (body.getMechanisms()== null) { - throw new AMQException(null, "mechanism not specified in ConnectionStart method frame", null); + throw new QpidException("mechanism not specified in ConnectionStart method frame", null); } else { @@ -110,7 +110,7 @@ public class ConnectionStartMethodHandle if (mechanism == null) { - throw new AMQException(null, "No supported security mechanism found, passed: " + new String(body.getMechanisms()), null); + throw new QpidException("No supported security mechanism found, passed: " + new String(body.getMechanisms()), null); } byte[] saslResponse; @@ -121,7 +121,7 @@ public class ConnectionStartMethodHandle createCallbackHandler(mechanism, session)); if (sc == null) { - throw new AMQException(null, "Client SASL configuration error: no SaslClient could be created for mechanism " + mechanism + throw new QpidException("Client SASL configuration error: no SaslClient could be created for mechanism " + mechanism + ". Please ensure all factories are registered. See DynamicSaslRegistrar for " + " details of how to register non-standard SASL client providers.", null); } @@ -132,12 +132,12 @@ public class ConnectionStartMethodHandle catch (SaslException e) { session.setSaslClient(null); - throw new AMQException(null, "Unable to create SASL client: " + e, e); + throw new QpidException("Unable to create SASL client: " + e, e); } if (body.getLocales() == null) { - throw new AMQException(null, "Locales is not defined in Connection Start method", null); + throw new QpidException("Locales is not defined in Connection Start method", null); } final String locales = new String(body.getLocales(), "utf8"); @@ -148,7 +148,7 @@ public class ConnectionStartMethodHandle } else { - throw new AMQException(null, "No locales sent from server, passed: " + locales, null); + throw new QpidException("No locales sent from server, passed: " + locales, null); } session.getStateManager().changeState(AMQState.CONNECTION_NOT_TUNED); @@ -186,7 +186,7 @@ public class ConnectionStartMethodHandle } catch (UnsupportedEncodingException e) { - throw new AMQException(null, "Unable to decode data: " + e, e); + throw new QpidException("Unable to decode data: " + e, e); } } else @@ -205,7 +205,7 @@ public class ConnectionStartMethodHandle } private AMQCallbackHandler createCallbackHandler(String mechanism, AMQProtocolSession protocolSession) - throws AMQException + throws QpidException { try { @@ -216,7 +216,7 @@ public class ConnectionStartMethodHandle } catch (IllegalArgumentException e) { - throw new AMQException(null, "Unable to create callback handler: " + e, e); + throw new QpidException("Unable to create callback handler: " + e, e); } } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.ExchangeBoundOkBody; @@ -45,7 +45,7 @@ public class ExchangeBoundOkMethodHandle { } public void methodReceived(AMQProtocolSession session, ExchangeBoundOkBody body, int channelId) - throws AMQException + throws QpidException { if (_logger.isDebugEnabled()) { Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.handler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.protocol.AMQProtocolSession; import org.apache.qpid.client.state.StateAwareMethodListener; import org.apache.qpid.framing.QueueDeleteOkBody; @@ -45,7 +45,7 @@ public class QueueDeleteOkMethodHandler { } public void methodReceived(AMQProtocolSession session, QueueDeleteOkBody body, int channelId) - throws AMQException + throws QpidException { if (_logger.isDebugEnabled()) { Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java Wed Jul 8 13:50:16 2015 @@ -41,7 +41,7 @@ import javax.jms.MessageNotWriteableExce import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.AMQPInvalidClassException; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQDestination.DestSyntax; @@ -320,7 +320,7 @@ public class AMQMessageDelegate_0_10 ext getAMQSession().setLegacyFieldsForTopicType(amqd); } } - catch(AMQException ex) + catch(QpidException ex) { throw JMSExceptionHelper.chainJMSException(new JMSException( "Error occured while figuring out the node type"), ex); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java Wed Jul 8 13:50:16 2015 @@ -23,7 +23,7 @@ package org.apache.qpid.client.message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.util.JMSExceptionHelper; import org.apache.qpid.transport.codec.BBDecoder; @@ -59,7 +59,7 @@ public class AMQPEncodedListMessage exte } AMQPEncodedListMessage(AMQMessageDelegate delegate, ByteBuffer data) - throws AMQException + throws QpidException { super(delegate, data); if (data != null) @@ -70,8 +70,7 @@ public class AMQPEncodedListMessage exte } catch (JMSException je) { - throw new AMQException(null, - "Error populating ListMessage from ByteBuffer", je); + throw new QpidException("Error populating ListMessage from ByteBuffer", je); } } currentIndex = 0; Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java Wed Jul 8 13:50:16 2015 @@ -21,7 +21,7 @@ package org.apache.qpid.client.message; */ -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import java.nio.ByteBuffer; @@ -29,7 +29,7 @@ public class AMQPEncodedListMessageFacto { @Override protected AbstractJMSMessage createMessage(AbstractAMQMessageDelegate delegate, - ByteBuffer data) throws AMQException + ByteBuffer data) throws QpidException { return new AMQPEncodedListMessage(delegate,data); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java Wed Jul 8 13:50:16 2015 @@ -21,7 +21,7 @@ package org.apache.qpid.client.message; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.transport.codec.BBDecoder; import org.apache.qpid.transport.codec.BBEncoder; @@ -46,7 +46,7 @@ public class AMQPEncodedMapMessage exten super(delegateFactory, data); } - AMQPEncodedMapMessage(AMQMessageDelegate delegate, ByteBuffer data) throws AMQException + AMQPEncodedMapMessage(AMQMessageDelegate delegate, ByteBuffer data) throws QpidException { super(delegate, data); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java Wed Jul 8 13:50:16 2015 @@ -21,7 +21,7 @@ package org.apache.qpid.client.message; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import java.nio.ByteBuffer; @@ -30,7 +30,7 @@ public class AMQPEncodedMapMessageFactor @Override protected AbstractJMSMessage createMessage(AbstractAMQMessageDelegate delegate, - ByteBuffer data) throws AMQException + ByteBuffer data) throws QpidException { return new AMQPEncodedMapMessage(delegate,data); } Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java Wed Jul 8 13:50:16 2015 @@ -21,7 +21,7 @@ package org.apache.qpid.client.message; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.util.JMSExceptionHelper; import org.apache.qpid.transport.util.Functions; @@ -44,7 +44,7 @@ public abstract class AbstractBytesTyped _readableMessage = fromReceivedMessage; } - AbstractBytesTypedMessage(AMQMessageDelegate delegate, boolean fromReceivedMessage) throws AMQException + AbstractBytesTypedMessage(AMQMessageDelegate delegate, boolean fromReceivedMessage) throws QpidException { super(delegate, fromReceivedMessage); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java Wed Jul 8 13:50:16 2015 @@ -20,7 +20,7 @@ */ package org.apache.qpid.client.message; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.AMQSession; import javax.jms.Destination; @@ -46,7 +46,7 @@ public abstract class AbstractJMSMessage setContentType(getMimeType()); } - protected AbstractJMSMessage(AMQMessageDelegate delegate, boolean fromReceivedData) throws AMQException + protected AbstractJMSMessage(AMQMessageDelegate delegate, boolean fromReceivedData) throws QpidException { _delegate = delegate; Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java Wed Jul 8 13:50:16 2015 @@ -32,7 +32,7 @@ import javax.jms.JMSException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession_0_8; import org.apache.qpid.client.AMQTopic; @@ -53,7 +53,7 @@ public abstract class AbstractJMSMessage List bodies, AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache, AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache, - final int addressType) throws AMQException + final int addressType) throws QpidException { ByteBuffer data; final boolean debug = _logger.isDebugEnabled(); @@ -125,12 +125,13 @@ public abstract class AbstractJMSMessage return createMessage(delegate, data); } - protected abstract AbstractJMSMessage createMessage(AbstractAMQMessageDelegate delegate, ByteBuffer data) throws AMQException; + protected abstract AbstractJMSMessage createMessage(AbstractAMQMessageDelegate delegate, ByteBuffer data) throws + QpidException; protected AbstractJMSMessage create010MessageWithBody(long messageNbr, MessageProperties msgProps, DeliveryProperties deliveryProps, - java.nio.ByteBuffer body) throws AMQException + java.nio.ByteBuffer body) throws QpidException { ByteBuffer data; final boolean debug = _logger.isDebugEnabled(); @@ -170,7 +171,7 @@ public abstract class AbstractJMSMessage AMQSession_0_8.DestinationCache<AMQQueue> queueDestinationCache, AMQSession_0_8.DestinationCache<AMQTopic> topicDestinationCache, int addressType) - throws JMSException, AMQException + throws JMSException, QpidException { final AbstractJMSMessage msg = create08MessageWithBody(messageNbr, contentHeader, exchange, routingKey, bodies, queueDestinationCache, topicDestinationCache, addressType); msg.setJMSRedelivered(redelivered); @@ -180,7 +181,7 @@ public abstract class AbstractJMSMessage public AbstractJMSMessage createMessage(long messageNbr, boolean redelivered, MessageProperties msgProps, DeliveryProperties deliveryProps, java.nio.ByteBuffer body) - throws JMSException, AMQException + throws JMSException, QpidException { final AbstractJMSMessage msg = create010MessageWithBody(messageNbr,msgProps,deliveryProps, body); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted010MessageFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted010MessageFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted010MessageFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted010MessageFactory.java Wed Jul 8 13:50:16 2015 @@ -38,7 +38,7 @@ import javax.security.auth.x500.X500Prin import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.AMQSession; import org.apache.qpid.transport.DeliveryProperties; import org.apache.qpid.transport.MessageProperties; @@ -58,7 +58,7 @@ public class Encrypted010MessageFactory @Override protected AbstractJMSMessage createMessage(final AbstractAMQMessageDelegate delegate, final ByteBuffer data) - throws AMQException + throws QpidException { SecretKeySpec secretKeySpec; String algorithm; @@ -82,7 +82,7 @@ public class Encrypted010MessageFactory } else { - throw new AMQException("If the property '" + throw new QpidException("If the property '" + MessageEncryptionHelper.KEY_INIT_VECTOR_PROPERTY + "' is present, it must contain a byte array"); } @@ -101,19 +101,19 @@ public class Encrypted010MessageFactory _messageFactoryRegistry.getSession()); if (secretKeySpec == null) { - throw new AMQException("Could not locate key information to decrypt the message"); + throw new QpidException("Could not locate key information to decrypt the message"); } } else { - throw new AMQException("An encrypted message must contain the property '" + throw new QpidException("An encrypted message must contain the property '" + MessageEncryptionHelper.ENCRYPTED_KEYS_PROPERTY + "'"); } } else { - throw new AMQException("An encrypted message must contain the property '" + throw new QpidException("An encrypted message must contain the property '" + MessageEncryptionHelper.ENCRYPTED_KEYS_PROPERTY + "'"); } @@ -121,7 +121,7 @@ public class Encrypted010MessageFactory } else { - throw new AMQException("Encrypted message must carry the encryption algorithm in the property '" + throw new QpidException("Encrypted message must carry the encryption algorithm in the property '" + MessageEncryptionHelper.ENCRYPTED_KEYS_PROPERTY + "'"); } @@ -169,12 +169,12 @@ public class Encrypted010MessageFactory } catch (GeneralSecurityException | IOException e) { - throw new AMQException("Could not decode encrypted message", e); + throw new QpidException("Could not decode encrypted message", e); } } - catch(AMQException e) + catch(QpidException e) { LOGGER.error("Error when attempting to decrypt message " + delegate.getDeliveryTag() + " to address ("+delegate.getJMSDestination()+"). Message will be delivered to the client encrypted", e); return _messageFactoryRegistry.getDefaultFactory().createMessage(delegate, data); @@ -211,7 +211,7 @@ public class Encrypted010MessageFactory private SecretKeySpec getContentEncryptionKey(final Collection keyInfoObjList, final String algorithm, final AMQSession<?, ?> session) - throws AMQException, GeneralSecurityException, IOException + throws QpidException, GeneralSecurityException, IOException { for(Object keyInfoObject : keyInfoObjList) @@ -240,13 +240,13 @@ public class Encrypted010MessageFactory } break; default: - throw new AMQException("Invalid format of 'x-qpid-encrypted-keys' - unknown key info type: " + type); + throw new QpidException("Invalid format of 'x-qpid-encrypted-keys' - unknown key info type: " + type); } } catch(ClassCastException e) { - throw new AMQException("Invalid format of 'x-qpid-encrypted-keys'"); + throw new QpidException("Invalid format of 'x-qpid-encrypted-keys'"); } } return null; Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted091MessageFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted091MessageFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted091MessageFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted091MessageFactory.java Wed Jul 8 13:50:16 2015 @@ -39,7 +39,7 @@ import javax.security.auth.x500.X500Prin import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.client.AMQSession; import org.apache.qpid.framing.BasicContentHeaderProperties; @@ -57,7 +57,7 @@ public class Encrypted091MessageFactory @Override protected AbstractJMSMessage createMessage(final AbstractAMQMessageDelegate delegate, final ByteBuffer data) - throws AMQException + throws QpidException { SecretKeySpec secretKeySpec; String algorithm; @@ -81,7 +81,7 @@ public class Encrypted091MessageFactory } else { - throw new AMQException("If the property '" + throw new QpidException("If the property '" + MessageEncryptionHelper.KEY_INIT_VECTOR_PROPERTY + "' is present, it must contain a byte array"); } @@ -101,14 +101,14 @@ public class Encrypted091MessageFactory } else { - throw new AMQException("An encrypted message must contain the property '" + throw new QpidException("An encrypted message must contain the property '" + MessageEncryptionHelper.ENCRYPTED_KEYS_PROPERTY + "'"); } } else { - throw new AMQException("An encrypted message must contain the property '" + throw new QpidException("An encrypted message must contain the property '" + MessageEncryptionHelper.ENCRYPTED_KEYS_PROPERTY + "'"); } @@ -116,7 +116,7 @@ public class Encrypted091MessageFactory } else { - throw new AMQException("Encrypted message must carry the encryption algorithm in the property '" + throw new QpidException("Encrypted message must carry the encryption algorithm in the property '" + MessageEncryptionHelper.ENCRYPTED_KEYS_PROPERTY + "'"); } @@ -164,10 +164,10 @@ public class Encrypted091MessageFactory } catch (GeneralSecurityException | IOException e) { - throw new AMQException("Could not decode encrypted message", e); + throw new QpidException("Could not decode encrypted message", e); } } - catch(AMQException e) + catch(QpidException e) { LOGGER.error("Error when attempting to decrypt message " + delegate.getDeliveryTag() + " to address ("+delegate.getJMSDestination()+"). Message will be delivered to the client encrypted", e); return _messageFactoryRegistry.getDefaultFactory().createMessage(delegate, data); @@ -205,7 +205,7 @@ public class Encrypted091MessageFactory private SecretKeySpec getContentEncryptionKey(final Collection keyInfoObjList, final String algorithm, final AMQSession<?, ?> session) - throws AMQException, GeneralSecurityException, IOException + throws QpidException, GeneralSecurityException, IOException { for(Object keyInfoObject : keyInfoObjList) @@ -234,13 +234,13 @@ public class Encrypted091MessageFactory } break; default: - throw new AMQException("Invalid format of 'x-qpid-encrypted-keys' - unknown key info type: " + type); + throw new QpidException("Invalid format of 'x-qpid-encrypted-keys' - unknown key info type: " + type); } } catch(ClassCastException e) { - throw new AMQException("Invalid format of 'x-qpid-encrypted-keys'"); + throw new QpidException("Invalid format of 'x-qpid-encrypted-keys'"); } } return null; Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java Wed Jul 8 13:50:16 2015 @@ -26,7 +26,7 @@ import javax.jms.BytesMessage; import javax.jms.JMSException; import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import org.apache.qpid.typedmessage.TypedBytesContentReader; import org.apache.qpid.typedmessage.TypedBytesContentWriter; import org.apache.qpid.typedmessage.TypedBytesFormatException; @@ -46,7 +46,7 @@ public class JMSBytesMessage extends Abs _typedBytesContentWriter = new TypedBytesContentWriter(); } - JMSBytesMessage(AMQMessageDelegate delegate, ByteBuffer data) throws AMQException + JMSBytesMessage(AMQMessageDelegate delegate, ByteBuffer data) throws QpidException { super(delegate, data!=null); _typedBytesContentReader = new TypedBytesContentReader(data); Modified: qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java?rev=1689876&r1=1689875&r2=1689876&view=diff ============================================================================== --- qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java (original) +++ qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java Wed Jul 8 13:50:16 2015 @@ -20,13 +20,14 @@ */ package org.apache.qpid.client.message; -import org.apache.qpid.AMQException; +import org.apache.qpid.QpidException; import java.nio.ByteBuffer; public class JMSBytesMessageFactory extends AbstractJMSMessageFactory { - protected AbstractJMSMessage createMessage(AbstractAMQMessageDelegate delegate, ByteBuffer data) throws AMQException + protected AbstractJMSMessage createMessage(AbstractAMQMessageDelegate delegate, ByteBuffer data) throws + QpidException { return new JMSBytesMessage(delegate, data); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
