Repository: activemq Updated Branches: refs/heads/trunk 5b7213eb8 -> 6466ae2bc
AMQ-5519: use the NOT_FOUND error condition when failing to find a DurableSubscription https://issues.apache.org/jira/browse/AMQ-5519 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/6466ae2b Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/6466ae2b Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/6466ae2b Branch: refs/heads/trunk Commit: 6466ae2bcfa8831d79f71e94709b0511dc1367cf Parents: 5b7213e Author: Robert Gemmell <rob...@apache.org> Authored: Wed Jan 14 16:47:41 2015 +0000 Committer: Robert Gemmell <rob...@apache.org> Committed: Wed Jan 14 16:47:41 2015 +0000 ---------------------------------------------------------------------- .../org/apache/activemq/transport/amqp/AmqpProtocolConverter.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/6466ae2b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java ---------------------------------------------------------------------- diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java index d623f4e..238b8b0 100644 --- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java +++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java @@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.jms.Destination; import javax.jms.InvalidClientIDException; +import javax.jms.InvalidDestinationException; import javax.jms.InvalidSelectorException; import org.apache.activemq.broker.BrokerService; @@ -1335,6 +1336,8 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter { Throwable exception = ((ExceptionResponse) response).getException(); if (exception instanceof SecurityException) { sender.setCondition(new ErrorCondition(AmqpError.UNAUTHORIZED_ACCESS, exception.getMessage())); + } else if (exception instanceof InvalidDestinationException){ + sender.setCondition(new ErrorCondition(AmqpError.NOT_FOUND, exception.getMessage())); } else { sender.setCondition(new ErrorCondition(AmqpError.INTERNAL_ERROR, exception.getMessage())); }
