Author: rgodfrey
Date: Wed Jul 8 13:50:16 2015
New Revision: 1689876
URL: http://svn.apache.org/r1689876
Log:
QPID-6632 : Refactor exceptions to separate those with(out) AMQ error codes and
remove deprecated constructors
Added:
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQException.java
- copied, changed from r1689874,
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQProtocolException.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQProtocolException.java
(with props)
qpid/java/trunk/common/src/main/java/org/apache/qpid/QpidException.java
- copied, changed from r1689639,
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQException.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/QpidExceptionTest.java
- copied, changed from r1689639,
qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
Removed:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSessionDirtyException.java
qpid/java/trunk/common/src/test/java/org/apache/qpid/AMQExceptionTest.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/PooledConnectionFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/TopicSubscriberAdaptor.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/ConnectionRedirectException.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/AccessRequestOkMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicCancelOkMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicDeliverMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/BasicReturnMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelCloseOkMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ChannelFlowOkMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_9.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_0_91.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ClientMethodDispatcherImpl_8_0.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionCloseMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionRedirectMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionSecureMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ConnectionStartMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/ExchangeBoundOkMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/handler/QueueDeleteOkMethodHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedListMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractBytesTypedMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted010MessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/Encrypted091MessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSBytesMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSMapMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSObjectMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSStreamMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSTextMessage.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/JMSTextMessageFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQMethodNotImplementedException.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/StateAwareMethodListener.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/StateWaiter.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/util/BlockingWaiter.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/jms/TopicSubscriber.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/AMQSession_0_8Test.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/DispatcherDaemonTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/handler/PooledConnectionFactoryTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseMethodHandlerNoCloseOk.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQChannelException.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQConnectionFailureException.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQDisconnectedException.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQSecurityException.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/AMQUnresolvedAddressException.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AMQBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AMQMethodBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AMQMethodBodyImpl.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AccessRequestBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/AccessRequestOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicAckBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicCancelBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicCancelOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicDeliverBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicGetBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicGetEmptyBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicGetOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicNackBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicPublishBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicQosBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicQosOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRecoverSyncOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicRejectBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicReturnBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelCloseBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelCloseOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelFlowBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelFlowOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelOpenBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelOpenOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ClientMethodDispatcher.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConfirmSelectBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConfirmSelectOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionCloseOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionOpenBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionOpenOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionRedirectBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionSecureBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionSecureOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionTuneBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionTuneOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderPropertiesFactory.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeBoundBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeBoundOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeleteOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/HeartbeatBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ProtocolInitiation.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeleteBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeleteOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueuePurgeBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueuePurgeOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ServerMethodDispatcher.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/TxCommitBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/TxCommitOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/TxRollbackBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/TxRollbackOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/TxSelectBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/TxSelectOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/failover/FailoverMethodTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/ChannelLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/DurableQueueLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/QueueLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/message/MessageProtocolConversionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ArrivalTimeFilterTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/DefaultFiltersTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/EnsureNondestructiveConsumersTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MessageGroupQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueBindTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/SortedQueueTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/MultipleAuthenticationManagersTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/ConnectionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
(original)
+++
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
Wed Jul 8 13:50:16 2015
@@ -51,6 +51,7 @@ import org.apache.qpid.framing.AMQShortS
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.protocol.v0_8.MessageMetaData;
import org.apache.qpid.server.store.StorableMessageMetaData;
@@ -681,7 +682,7 @@ public class UpgradeFrom4To5 extends Abs
}
catch (IOException e)
{
- throw new AMQFrameDecodingException(null, e.getMessage(), e);
+ throw new
AMQFrameDecodingException(AMQConstant.INTERNAL_ERROR, e.getMessage(), e);
}
}
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Wed Jul 8 13:50:16 2015
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.framing.*;
@@ -258,7 +258,7 @@ public class AMQChannel
{
closeConnection(reason);
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw new ConnectionScopedRuntimeException(e);
}
@@ -693,7 +693,7 @@ public class AMQChannel
* @param exclusive Flag requesting exclusive access to the queue
* @return the consumer tag. This is returned to the subscriber and used
in subsequent unsubscribe requests
*
- * @throws org.apache.qpid.AMQException if something goes
wrong
+ * @throws QpidException if something goes wrong
*/
public AMQShortString consumeFromSource(AMQShortString tag,
Collection<MessageSource> sources, boolean acks,
FieldTable arguments, boolean
exclusive, boolean noLocal)
@@ -1772,7 +1772,7 @@ public class AMQChannel
* Typically called from the HouseKeepingThread instead of the main
receiver thread,
* therefore uses a lock to close the connection in a thread-safe manner.
*/
- private void closeConnection(String reason) throws AMQException
+ private void closeConnection(String reason) throws QpidException
{
_connection.closeAsync(AMQConstant.RESOURCE_ERROR, reason);
}
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQNoMethodHandlerException.java
Wed Jul 8 13:50:16 2015
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.framing.AMQMethodBody;
import org.apache.qpid.protocol.AMQMethodEvent;
@@ -33,7 +33,7 @@ import org.apache.qpid.protocol.AMQMetho
* TODO Missing method handler. Unlikely to ever happen, and if it does its a
coding error. Consider replacing with a
* Runtime.
*/
-public class AMQNoMethodHandlerException extends AMQException
+public class AMQNoMethodHandlerException extends QpidException
{
public AMQNoMethodHandlerException(AMQMethodEvent<AMQMethodBody> evt)
{
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
Wed Jul 8 13:50:16 2015
@@ -54,7 +54,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.AMQConnectionException;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.codec.AMQDecoder;
import org.apache.qpid.common.QpidProperties;
import org.apache.qpid.common.ServerPropertyNames;
@@ -481,7 +481,7 @@ public class AMQPConnection_0_8
_sender.flush();
}
- catch (AMQException e)
+ catch (QpidException e)
{
_logger.info("Received unsupported protocol initiation for
protocol version: " + getProtocolVersion());
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ConsumerTarget_0_8.java
Wed Jul 8 13:50:16 2015
@@ -25,7 +25,7 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.common.AMQPFilterTypes;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
@@ -120,7 +120,7 @@ public abstract class ConsumerTarget_0_8
* @param consumer
* @param entry
* @param batch
- * @throws org.apache.qpid.AMQException
+ * @throws QpidException
*/
@Override
public void doSend(final ConsumerImpl consumer, MessageInstance entry,
boolean batch)
@@ -149,7 +149,7 @@ public abstract class ConsumerTarget_0_8
AMQShortString
consumerTag, FieldTable filters,
FlowCreditManager
creditManager,
ClientDeliveryMethod
deliveryMethod,
- RecordDeliveryMethod
recordMethod) throws AMQException
+ RecordDeliveryMethod
recordMethod) throws QpidException
{
return new NoAckConsumer(channel, consumerTag, filters, creditManager,
deliveryMethod, recordMethod);
}
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
Wed Jul 8 13:50:16 2015
@@ -24,7 +24,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.framing.AMQBody;
import org.apache.qpid.framing.AMQDataBlock;
import org.apache.qpid.framing.AMQFrame;
@@ -265,7 +265,7 @@ public class ProtocolOutputConverterImpl
return size;
}
- public void handle(int channelId, AMQVersionAwareProtocolSession
amqProtocolSession) throws AMQException
+ public void handle(int channelId, AMQVersionAwareProtocolSession
amqProtocolSession) throws QpidException
{
throw new UnsupportedOperationException();
}
@@ -366,9 +366,9 @@ public class ProtocolOutputConverterImpl
}
public void handle(final int channelId, final
AMQVersionAwareProtocolSession amqProtocolSession)
- throws AMQException
+ throws QpidException
{
- throw new AMQException("This block should never be dispatched!");
+ throw new QpidException("This block should never be dispatched!");
}
@Override
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
Wed Jul 8 13:50:16 2015
@@ -24,7 +24,7 @@ import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.server.message.MessageInstance;
@@ -35,7 +35,7 @@ public interface UnacknowledgedMessageMa
/**
* @param deliveryTag
*@param message the message being iterated over @return true to stop
iteration, false to continue
- * @throws AMQException
+ * @throws QpidException
*/
boolean callback(final long deliveryTag, MessageInstance message);
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/AckTest.java
Wed Jul 8 13:50:16 2015
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Set;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
@@ -80,12 +80,12 @@ public class AckTest extends QpidTestCas
super.tearDown();
}
- private void publishMessages(int count) throws AMQException
+ private void publishMessages(int count) throws QpidException
{
publishMessages(count, false);
}
- private void publishMessages(int count, boolean persistent) throws
AMQException
+ private void publishMessages(int count, boolean persistent) throws
QpidException
{
for (int i = 1; i <= count; i++)
{
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/BrokerTestHelper_0_8.java
Wed Jul 8 13:50:16 2015
@@ -24,7 +24,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
@@ -38,7 +38,7 @@ import org.apache.qpid.server.virtualhos
public class BrokerTestHelper_0_8 extends BrokerTestHelper
{
- public static AMQChannel createChannel(int channelId, AMQPConnection_0_8
session) throws AMQException
+ public static AMQChannel createChannel(int channelId, AMQPConnection_0_8
session) throws QpidException
{
AMQChannel channel = new AMQChannel(session, channelId,
session.getVirtualHost().getMessageStore());
session.addChannel(channel);
@@ -74,7 +74,7 @@ public class BrokerTestHelper_0_8 extend
}
public static void publishMessages(AMQChannel channel, int
numberOfMessages, String queueName, String exchangeName)
- throws AMQException
+ throws QpidException
{
AMQShortString routingKey = new AMQShortString(queueName);
AMQShortString exchangeNameAsShortString = new
AMQShortString(exchangeName);
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ExtractResendAndRequeueTest.java
Wed Jul 8 13:50:16 2015
@@ -20,7 +20,7 @@
*/
package org.apache.qpid.server.protocol.v0_8;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.message.MessageInstance;
import org.apache.qpid.server.message.ServerMessage;
@@ -66,7 +66,7 @@ public class ExtractResendAndRequeueTest
private boolean _queueDeleted;
@Override
- public void setUp() throws AMQException
+ public void setUp() throws QpidException
{
_queueDeleted = false;
_unacknowledgedMessageMap = new UnacknowledgedMessageMapImpl(100);
@@ -131,9 +131,9 @@ public class ExtractResendAndRequeueTest
*
* This test validates that the msgToResend map includes all the messages
and none are left behind.
*
- * @throws AMQException the visit interface throws this
+ * @throws QpidException the visit interface throws this
*/
- public void testResend() throws AMQException
+ public void testResend() throws QpidException
{
//We don't need the subscription object here.
acquireMessages(_referenceList);
@@ -158,9 +158,9 @@ public class ExtractResendAndRequeueTest
*
* This test validates that the msgToRequeue map includes all the messages
and none are left behind.
*
- * @throws AMQException the visit interface throws this
+ * @throws QpidException the visit interface throws this
*/
- public void testRequeueDueToSubscriptionClosure() throws AMQException
+ public void testRequeueDueToSubscriptionClosure() throws QpidException
{
acquireMessages(_referenceList);
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
Wed Jul 8 13:50:16 2015
@@ -39,7 +39,7 @@ import javax.security.auth.Subject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.MessagePublishInfo;
@@ -64,7 +64,8 @@ public class InternalTestProtocolSession
private AtomicInteger _deliveryCount = new AtomicInteger(0);
private static final AtomicLong ID_GENERATOR = new AtomicLong(0);
- public InternalTestProtocolSession(VirtualHostImpl virtualHost, Broker<?>
broker, final AmqpPort<?> port) throws AMQException
+ public InternalTestProtocolSession(VirtualHostImpl virtualHost, Broker<?>
broker, final AmqpPort<?> port) throws
+
QpidException
{
super(broker, new TestNetworkConnection(), port, null,
ID_GENERATOR.getAndIncrement(), new AggregateTicker());
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/ReferenceCountingTest.java
Wed Jul 8 13:50:16 2015
@@ -22,7 +22,7 @@ package org.apache.qpid.server.protocol.
import java.util.UUID;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.framing.BasicContentHeaderProperties;
import org.apache.qpid.framing.ContentHeaderBody;
import org.apache.qpid.framing.MessagePublishInfo;
@@ -52,7 +52,7 @@ public class ReferenceCountingTest exten
/**
* Check that when the reference count is decremented the message removes
itself from the store
*/
- public void testMessageGetsRemoved() throws AMQException
+ public void testMessageGetsRemoved() throws QpidException
{
ContentHeaderBody chb = createPersistentContentHeader();
@@ -90,7 +90,7 @@ public class ReferenceCountingTest exten
return chb;
}
- public void testMessageRemains() throws AMQException
+ public void testMessageRemains() throws QpidException
{
MessagePublishInfo info = new MessagePublishInfo(null, false, false,
null);
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
Wed Jul 8 13:50:16 2015
@@ -62,6 +62,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.AMQConnectionFailureException;
import org.apache.qpid.AMQDisconnectedException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQProtocolException;
import org.apache.qpid.AMQUnresolvedAddressException;
@@ -248,11 +249,11 @@ public class AMQConnection extends Close
* @param clientName clientid
* @param virtualHost virtualhost
*
- * @throws AMQException
+ * @throws QpidException
* @throws URLSyntaxException
*/
public AMQConnection(String broker, String username, String password,
String clientName, String virtualHost)
- throws AMQException, URLSyntaxException
+ throws QpidException, URLSyntaxException
{
this(new AMQConnectionURL(
ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" + password
+ "@"
@@ -261,14 +262,14 @@ public class AMQConnection extends Close
}
public AMQConnection(String host, int port, String username, String
password, String clientName, String virtualHost)
- throws AMQException, URLSyntaxException
+ throws QpidException, URLSyntaxException
{
this(new AMQConnectionURL(
ConnectionURL.AMQ_PROTOCOL + "://" + username + ":" +
password + "@"
+ ((clientName == null) ? "" : clientName) + virtualHost +
"?brokerlist='tcp://" + host + ":" + port + "'"));
}
- public AMQConnection(String connection) throws AMQException,
URLSyntaxException
+ public AMQConnection(String connection) throws QpidException,
URLSyntaxException
{
this(new AMQConnectionURL(connection));
}
@@ -277,7 +278,7 @@ public class AMQConnection extends Close
* TODO Some horrible stuff going on here with setting exceptions to be
non-null to detect if an exception
* was thrown during the connection! Intention not clear. Use a flag
anyway, not exceptions... Will fix soon.
*/
- public AMQConnection(ConnectionURL connectionURL) throws AMQException
+ public AMQConnection(ConnectionURL connectionURL) throws QpidException
{
if (connectionURL == null)
{
@@ -469,7 +470,7 @@ public class AMQConnection extends Close
_connectionMetaData = new QpidConnectionMetaData(this);
}
- private void makeConnection() throws AMQException
+ private void makeConnection() throws QpidException
{
_connectionAttempted = true;
if(_clientName == null)
@@ -700,7 +701,7 @@ public class AMQConnection extends Close
}
catch (Exception e)
{
- if (!(e instanceof AMQException))
+ if (!(e instanceof QpidException))
{
if (_logger.isInfoEnabled())
{
@@ -719,7 +720,7 @@ public class AMQConnection extends Close
return false;
}
- public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail)
throws IOException, AMQException
+ public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail)
throws IOException, QpidException
{
resetClosedFlag();
return _delegate.makeBrokerConnection(brokerDetail);
@@ -778,7 +779,7 @@ public class AMQConnection extends Close
{
makeConnection();
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException("Unable to establish connection"),e);
}
@@ -805,7 +806,7 @@ public class AMQConnection extends Close
{
((AMQSession)session).start();
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException(
"Failed to retrieve virtual host properties"), e);
@@ -837,7 +838,7 @@ public class AMQConnection extends Close
{
((AMQSession) _brokerTrustStoreSession).start();
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException(
"Failed to retrieve virtual host properties"),
e);
@@ -1020,7 +1021,7 @@ public class AMQConnection extends Close
{
s.start();
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException("Connection.start failed"), e);
}
@@ -1040,7 +1041,7 @@ public class AMQConnection extends Close
{
((AMQSession) i.next()).stop();
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException("Connection.stop failed."), e);
}
@@ -1379,7 +1380,7 @@ public class AMQConnection extends Close
return _failoverMutex;
}
- public void resubscribeSessions() throws JMSException, AMQException,
FailoverException
+ public void resubscribeSessions() throws JMSException, QpidException,
FailoverException
{
_delegate.resubscribeSessions();
}
@@ -1754,7 +1755,7 @@ public class AMQConnection extends Close
return _useLegacyStreamMessageFormat;
}
- private void verifyClientID() throws AMQException
+ private void verifyClientID() throws QpidException
{
if (Boolean.getBoolean(ClientProperties.QPID_VERIFY_CLIENT_ID))
{
@@ -1767,7 +1768,7 @@ public class AMQConnection extends Close
}
catch(JMSException e)
{
- throw new AMQException(e.getMessage(),e);
+ throw new QpidException(e.getMessage(),e);
}
}
}
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
Wed Jul 8 13:50:16 2015
@@ -25,7 +25,7 @@ import java.io.IOException;
import javax.jms.JMSException;
import javax.jms.XASession;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.failover.FailoverProtectedOperation;
import org.apache.qpid.framing.ProtocolVersion;
@@ -33,7 +33,7 @@ import org.apache.qpid.jms.Session;
public interface AMQConnectionDelegate
{
- ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws
IOException, AMQException;
+ ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail) throws
IOException, QpidException;
Session createSession(final boolean transacted, final int acknowledgeMode,
final int prefetchHigh, final int prefetchLow) throws JMSException;
@@ -51,9 +51,9 @@ public interface AMQConnectionDelegate
XASession createXASession(int ackMode) throws JMSException;
- void resubscribeSessions() throws JMSException, AMQException,
FailoverException;
+ void resubscribeSessions() throws JMSException, QpidException,
FailoverException;
- void closeConnection(long timeout) throws JMSException, AMQException;
+ void closeConnection(long timeout) throws JMSException, QpidException;
<T, E extends Exception> T
executeRetrySupport(FailoverProtectedOperation<T,E> operation) throws E;
@@ -63,7 +63,7 @@ public interface AMQConnectionDelegate
ProtocolVersion getProtocolVersion();
- boolean verifyClientID() throws JMSException, AMQException;
+ boolean verifyClientID() throws JMSException, QpidException;
/**
* Tests whether the server has advertised support for the specified
feature
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
Wed Jul 8 13:50:16 2015
@@ -36,6 +36,7 @@ import javax.jms.XASession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.qpid.QpidException;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.failover.FailoverProtectedOperation;
@@ -203,9 +204,9 @@ public class AMQConnectionDelegate_0_10
*
* @param brokerDetail The detail of the broker to connect to.
* @throws IOException
- * @throws AMQException
+ * @throws QpidException
*/
- public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail)
throws IOException, AMQException
+ public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail)
throws IOException, QpidException
{
try
{
@@ -257,7 +258,7 @@ public class AMQConnectionDelegate_0_10
}
}
- public void resubscribeSessions() throws JMSException, AMQException,
FailoverException
+ public void resubscribeSessions() throws JMSException, QpidException,
FailoverException
{
_logger.info("Resuming connection");
getQpidConnection().resume();
@@ -269,7 +270,7 @@ public class AMQConnectionDelegate_0_10
}
}
- public void closeConnection(long timeout) throws JMSException, AMQException
+ public void closeConnection(long timeout) throws JMSException,
QpidException
{
try
{
@@ -277,7 +278,7 @@ public class AMQConnectionDelegate_0_10
}
catch (TransportException e)
{
- throw new AMQException(e.getMessage(), e);
+ throw new QpidException(e.getMessage(), e);
}
}
@@ -567,7 +568,7 @@ public class AMQConnectionDelegate_0_10
return _qpidConnection;
}
- public boolean verifyClientID() throws JMSException, AMQException
+ public boolean verifyClientID() throws JMSException, QpidException
{
int prefetch = (int)_conn.getMaxPrefetch();
AMQSession_0_10 ssn = (AMQSession_0_10)createSession(false,
1,prefetch,prefetch,_conn.getClientID());
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
Wed Jul 8 13:50:16 2015
@@ -34,7 +34,7 @@ import javax.jms.XASession;
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.failover.FailoverProtectedOperation;
import org.apache.qpid.client.failover.FailoverRetrySupport;
@@ -80,7 +80,7 @@ public class AMQConnectionDelegate_8_0 i
private boolean _confirmedPublishNonTransactionalSupported;
private boolean _virtualhostPropertiesSupported;
- public void closeConnection(long timeout) throws JMSException, AMQException
+ public void closeConnection(long timeout) throws JMSException,
QpidException
{
_conn.getProtocolHandler().closeConnection(timeout);
}
@@ -110,7 +110,7 @@ public class AMQConnectionDelegate_8_0 i
return _confirmedPublishSupported;
}
- public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail)
throws AMQException
+ public ProtocolVersion makeBrokerConnection(BrokerDetails brokerDetail)
throws QpidException
{
if (_logger.isDebugEnabled())
{
@@ -184,7 +184,7 @@ public class AMQConnectionDelegate_8_0 i
return
_conn.getProtocolHandler().getSuggestedProtocolVersion();
}
}
- catch(AMQException | RuntimeException e)
+ catch(QpidException | RuntimeException e)
{
network.close();
throw e;
@@ -284,7 +284,7 @@ public class AMQConnectionDelegate_8_0 i
session.setPrefetchLimits(prefetchHigh, 0);
success = true;
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException("Error creating session: " + e),
e);
@@ -303,7 +303,7 @@ public class AMQConnectionDelegate_8_0 i
{
session.start();
}
- catch (AMQException e)
+ catch (QpidException e)
{
throw JMSExceptionHelper.chainJMSException(new
JMSException("Session.start failed"), e);
}
@@ -327,7 +327,7 @@ public class AMQConnectionDelegate_8_0 i
}
private void createChannelOverWire(int channelId, boolean transacted)
- throws AMQException, FailoverException
+ throws QpidException, FailoverException
{
ChannelOpenBody channelOpenBody =
_conn.getProtocolHandler().getMethodRegistry().createChannelOpenBody(null);
_conn.getProtocolHandler().syncWrite(channelOpenBody.generateFrame(channelId),
ChannelOpenOkBody.class);
@@ -361,7 +361,7 @@ public class AMQConnectionDelegate_8_0 i
* For all sessions, and for all consumers in those sessions, resubscribe.
This is called during failover handling.
* The caller must hold the failover mutex before calling this method.
*/
- public void resubscribeSessions() throws JMSException, AMQException,
FailoverException
+ public void resubscribeSessions() throws JMSException, QpidException,
FailoverException
{
ArrayList sessions = new ArrayList(_conn.getSessions().values());
_logger.info(MessageFormat.format("Resubscribing sessions = {0}
sessions.size={1}", sessions, sessions.size())); // FIXME: removeKey?
@@ -381,16 +381,16 @@ public class AMQConnectionDelegate_8_0 i
}
private void reopenChannel(int channelId, int prefetchHigh, int
prefetchLow, boolean transacted)
- throws AMQException, FailoverException
+ throws QpidException, FailoverException
{
try
{
createChannelOverWire(channelId, transacted);
}
- catch (AMQException e)
+ catch (QpidException e)
{
_conn.deregisterSession(channelId);
- throw new AMQException(null, "Error reopening channel " +
channelId + " after failover: " + e, e);
+ throw new QpidException("Error reopening channel " + channelId + "
after failover: " + e, e);
}
}
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java?rev=1689876&r1=1689875&r2=1689876&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
Wed Jul 8 13:50:16 2015
@@ -22,8 +22,9 @@ package org.apache.qpid.client;
import javax.jms.InvalidDestinationException;
import javax.jms.InvalidSelectorException;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.QpidException;
import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.AMQException;
import org.apache.qpid.client.filter.JMSSelectorFilter;
import org.apache.qpid.client.util.JMSExceptionHelper;
import org.apache.qpid.protocol.AMQConstant;
@@ -86,16 +87,17 @@ public class AMQQueueBrowser implements
// TODO - should really validate queue exists, but we often rely
on creating the consumer to create the queue :(
// _session.declareQueuePassive( queue );
}
- catch (AMQException e)
+ catch (QpidException e)
{
- if(e.getErrorCode() == AMQConstant.NOT_FOUND)
+ AMQConstant errorCode = (e instanceof AMQException) ?
((AMQException)e).getErrorCode() : null;
+ if(errorCode == AMQConstant.NOT_FOUND)
{
throw new InvalidDestinationException(e.getMessage());
}
else
{
throw JMSExceptionHelper.chainJMSException(new
JMSException(e.getMessage(),
-
String.valueOf(e.getErrorCode().getCode())),
+
String.valueOf(errorCode.getCode())),
e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
