Repository: qpid-broker-j
Updated Branches:
refs/heads/7.0.x 3bf704d53 -> 196243963
QPID-8231: [Broker-J] Do not allow setting empty string as value of queue attributes 'messageGroupKeyOverride' and 'messageGroupDefaultGroup'
(cherry picked from commit cad240e1b4f6fad50d9d24eb49691f84601977b5)
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/3cc87eed
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/3cc87eed
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/3cc87eed
Branch: refs/heads/7.0.x
Commit: 3cc87eedbf2debe16d58dcd1157fd647f398afb3
Parents: 3bf704d
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Sep 7 14:22:30 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 19 13:47:47 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/server/model/Queue.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/3cc87eed/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
index c7ea2d8..dcf4ab4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/model/Queue.java
@@ -147,7 +147,8 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>,
@ManagedAttribute(description = "Specifies the name of the message header that provides the value for message "
+ "grouping purposes. If not set, for AMQP 1.0 the value of the group-id field "
+ "within the message properties is used. For AMQP 0-8..0-10, the value of the "
- + "message header JMSXGroupId is used.")
+ + "message header JMSXGroupId is used.",
+ validValuePattern = "^(?!\\s*$).+")
String getMessageGroupKeyOverride();
@SuppressWarnings("unused")
@@ -155,7 +156,8 @@ public interface Queue<X extends Queue<X>> extends ConfiguredObject<X>,
String DEFAULT_SHARED_MESSAGE_GROUP = "qpid.no-group";
@ManagedAttribute( defaultValue = "${qpid.broker_default-shared-message-group}",
- description = "Fallback group used for messages without a group identifier. Used by SHARED_GROUPS only.")
+ description = "Fallback group used for messages without a group identifier. Used by SHARED_GROUPS only.",
+ validValuePattern = "^(?!\\s*$).+")
String getMessageGroupDefaultGroup();
@SuppressWarnings("unused")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
QPID-8233: [Broker-J] Send "connection-forced" error when virtual host is in the process of activating
(cherry picked from commit 7ff50badfd0379e2ceb61308ca89f3890e70b7b0)
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/19624396
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/19624396
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/19624396
Branch: refs/heads/7.0.x
Commit: 19624396396fc09d0dbc55dbdbfe63b3dad130e0
Parents: 3cc87ee
Author: Alex Rudyy <or...@apache.org>
Authored: Sun Sep 9 23:11:18 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 19 13:50:16 2018 +0100
----------------------------------------------------------------------
.../apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/19624396/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
index 03954b4..02465a2 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
@@ -912,7 +912,6 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio
if (!addressSpace.isActive())
{
final Error err = new Error();
- err.setCondition(AmqpError.NOT_FOUND);
populateConnectionRedirect(addressSpace, err);
closeConnection(err);
}
@@ -1023,10 +1022,12 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio
if(redirectHost == null)
{
+ err.setCondition(ConnectionError.CONNECTION_FORCED);
err.setDescription("Virtual host '" + _localHostname + "' is not active");
}
else
{
+ err.setCondition(ConnectionError.REDIRECT);
String networkHost;
int port;
if(redirectHost.matches("\\[[0-9a-f:]+\\](:[0-9]+)?"))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org