From commits-return-43301-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Tue Jan 9 16:40:03 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 549BD180718 for ; Tue, 9 Jan 2018 16:40:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4489A160C2D; Tue, 9 Jan 2018 15:40:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 613CC160C13 for ; Tue, 9 Jan 2018 16:40:02 +0100 (CET) Received: (qmail 68427 invoked by uid 500); 9 Jan 2018 15:40:01 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 68418 invoked by uid 99); 9 Jan 2018 15:40:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jan 2018 15:40:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2B3DE1794; Tue, 9 Jan 2018 15:39:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kwall@apache.org To: commits@qpid.apache.org Date: Tue, 09 Jan 2018 15:39:58 -0000 Message-Id: <451ee9d932cb4baaa509fecdae90eda7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] qpid-broker-j git commit: QPID-8061: [Broker-J] [AMQP 0-8..0-9-1] Handle unknown alternate exchange on exchange declaration Repository: qpid-broker-j Updated Branches: refs/heads/7.0.x 4c8f854f1 -> 9a7628595 QPID-8061: [Broker-J] [AMQP 0-8..0-9-1] Handle unknown alternate exchange on exchange declaration Cherry picked from master 38c04f8. Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/89259c2d Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/89259c2d Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/89259c2d Branch: refs/heads/7.0.x Commit: 89259c2de1aa1df1f582e0012c881cbb8cf61e00 Parents: 4c8f854 Author: Alex Rudyy Authored: Thu Dec 7 10:33:01 2017 +0000 Committer: Keith Wall Committed: Tue Jan 9 14:50:54 2018 +0000 ---------------------------------------------------------------------- .../apache/qpid/server/exchange/AbstractExchange.java | 5 +++-- .../server/model/UnknownConfiguredObjectException.java | 13 +++++++++++-- .../server/protocol/v0_10/ServerSessionDelegate.java | 2 +- .../apache/qpid/server/protocol/v0_8/AMQChannel.java | 9 ++------- 4 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/89259c2d/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java index 897878d..b3714e9 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java +++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java @@ -71,6 +71,7 @@ import org.apache.qpid.server.model.PublishingLink; import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.StateTransition; +import org.apache.qpid.server.model.UnknownConfiguredObjectException; import org.apache.qpid.server.protocol.LinkModel; import org.apache.qpid.server.queue.CreatingLinkInfo; import org.apache.qpid.server.security.SecurityToken; @@ -1054,9 +1055,9 @@ public abstract class AbstractExchange> _virtualHost.getAttainedMessageDestination(destinationName, mayCreate); if (messageDestination == null) { - throw new IllegalConfigurationException(String.format( + throw new UnknownConfiguredObjectException(String.format( "Cannot create alternate binding for '%s' : Alternate binding destination '%s' cannot be found.", - getName(), destinationName)); + getName(), destinationName), ConfiguredObject.class, destinationName); } else if (messageDestination == this) { http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/89259c2d/broker-core/src/main/java/org/apache/qpid/server/model/UnknownConfiguredObjectException.java ---------------------------------------------------------------------- diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/UnknownConfiguredObjectException.java b/broker-core/src/main/java/org/apache/qpid/server/model/UnknownConfiguredObjectException.java index f35a68a..f460df7 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/model/UnknownConfiguredObjectException.java +++ b/broker-core/src/main/java/org/apache/qpid/server/model/UnknownConfiguredObjectException.java @@ -28,13 +28,22 @@ public class UnknownConfiguredObjectException extends IllegalArgumentException private String _name; private UUID _id; - public UnknownConfiguredObjectException(final Class category, final String name) + public UnknownConfiguredObjectException(String exceptionMessage, + final Class category, + final String name) { - super("Could not find object of category " + category.getSimpleName() + " with name '" + name + "'"); + super(exceptionMessage); _category = category; _name = name; } + public UnknownConfiguredObjectException(final Class category, final String name) + { + this("Could not find object of category " + category.getSimpleName() + " with name '" + name + "'", + category, + name); + } + public UnknownConfiguredObjectException(final Class category, final UUID id) { super("Could not find object of category " + category.getSimpleName() + " with id " + id); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/89259c2d/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java index ab5581c..9fd9b52 100644 --- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java +++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java @@ -986,7 +986,7 @@ public class ServerSessionDelegate extends MethodDelegate impleme { exception(session, method, ExecutionErrorCode.UNAUTHORIZED_ACCESS, e.getMessage()); } - catch (IllegalConfigurationException e) + catch (IllegalArgumentException | IllegalConfigurationException e) { exception(session, method, ExecutionErrorCode.ILLEGAL_ARGUMENT, e.getMessage()); } http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/89259c2d/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java ---------------------------------------------------------------------- diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java index d2f071e..5eef253 100644 --- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java +++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java @@ -83,7 +83,6 @@ import org.apache.qpid.server.model.LifetimePolicy; import org.apache.qpid.server.model.NamedAddressSpace; import org.apache.qpid.server.model.NoFactoryForTypeException; import org.apache.qpid.server.model.Queue; -import org.apache.qpid.server.model.Session; import org.apache.qpid.server.model.UnknownConfiguredObjectException; import org.apache.qpid.server.protocol.ErrorCodes; import org.apache.qpid.server.protocol.ProtocolVersion; @@ -2723,15 +2722,11 @@ public class AMQChannel extends AbstractAMQPSession