Repository: qpid-jms Updated Branches: refs/heads/master 527f838ef -> 109bb5a38
throw InvalidDestinationException when encountering the NOT_FOUND condition, e.g when attempting to remove a non-existing DurableSubscription Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/109bb5a3 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/109bb5a3 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/109bb5a3 Branch: refs/heads/master Commit: 109bb5a384b81702b59be3ec51b23989ac042ec6 Parents: 527f838 Author: Robert Gemmell <rob...@apache.org> Authored: Wed Jan 14 18:02:44 2015 +0000 Committer: Robert Gemmell <rob...@apache.org> Committed: Wed Jan 14 18:03:10 2015 +0000 ---------------------------------------------------------------------- .../org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java | 3 +++ .../org/apache/qpid/jms/provider/amqp/AmqpConnectionSession.java | 3 ++- .../main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/109bb5a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java index 090fb1a..dbadbca 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java @@ -18,6 +18,7 @@ package org.apache.qpid.jms.provider.amqp; import java.io.IOException; +import javax.jms.InvalidDestinationException; import javax.jms.JMSException; import javax.jms.JMSSecurityException; @@ -221,6 +222,8 @@ public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endp if (error != null) { if (error.equals(AmqpError.UNAUTHORIZED_ACCESS)) { remoteError = new JMSSecurityException(message); + } else if (error.equals(AmqpError.NOT_FOUND)) { + remoteError = new InvalidDestinationException(message); } else { remoteError = new JMSException(message); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/109bb5a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionSession.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionSession.java index e08d1b9..c8e2881 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionSession.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConnectionSession.java @@ -19,6 +19,7 @@ package org.apache.qpid.jms.provider.amqp; import java.util.HashMap; import java.util.Map; +import javax.jms.InvalidDestinationException; import javax.jms.JMSException; import org.apache.qpid.jms.meta.JmsSessionInfo; @@ -110,7 +111,7 @@ public class AmqpConnectionSession extends AmqpSession { subscriber.close(getWrappedRequest()); } else { subscriber.close(NoOpAsyncResult.INSTANCE); - getWrappedRequest().onFailure(new JMSException("Cannot remove a subscription that does not exist")); + getWrappedRequest().onFailure(new InvalidDestinationException("Cannot remove a subscription that does not exist")); } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/109bb5a3/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java index d455842..d56e0b0 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java @@ -177,7 +177,7 @@ public class AmqpProvider extends AbstractProvider implements TransportListener try { transport.close(); } catch (Exception e) { - LOG.debug("Cuaght exception while closing down Transport: {}", e.getMessage()); + LOG.debug("Caught exception while closing down Transport: {}", e.getMessage()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
