You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/03/06 02:49:50 UTC
[activemq-artemis] branch master updated: NO-JIRA reconcile STOMP
prop names b/w code & doc
This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new a9e6dbb NO-JIRA reconcile STOMP prop names b/w code & doc
a9e6dbb is described below
commit a9e6dbb0e3803f9449a5839bf880e84c988e8683
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Thu Mar 5 20:44:47 2020 -0600
NO-JIRA reconcile STOMP prop names b/w code & doc
---
.../activemq/artemis/core/protocol/stomp/StompConnection.java | 4 ++--
docs/user-manual/en/stomp.md | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index 60c2d56..2709c16 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -181,8 +181,8 @@ public final class StompConnection implements RemotingConnection {
this.acceptorUsed = acceptorUsed;
- this.enableMessageID = ConfigurationHelper.getBooleanProperty(TransportConstants.STOMP_ENABLE_MESSAGE_ID, false, acceptorUsed.getConfiguration());
- this.minLargeMessageSize = ConfigurationHelper.getIntProperty(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, acceptorUsed.getConfiguration());
+ this.enableMessageID = ConfigurationHelper.getBooleanProperty(TransportConstants.STOMP_ENABLE_MESSAGE_ID_DEPRECATED, false, acceptorUsed.getConfiguration()) || ConfigurationHelper.getBooleanProperty(TransportConstants.STOMP_ENABLE_MESSAGE_ID, false, acceptorUsed.getConfiguration());
+ this.minLargeMessageSize = ConfigurationHelper.getIntProperty(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE, ConfigurationHelper.getIntProperty(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE_DEPRECATED, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, acceptorUsed.getConfiguration()), acceptorUsed.getConfiguration());
}
@Override
diff --git a/docs/user-manual/en/stomp.md b/docs/user-manual/en/stomp.md
index 79f413d..51372a8 100644
--- a/docs/user-manual/en/stomp.md
+++ b/docs/user-manual/en/stomp.md
@@ -208,14 +208,14 @@ message. If you want each STOMP message to have a unique ID, just set the
When the server starts with the above setting, each stomp message sent through
this acceptor will have an extra property added. The property key is
-`amq-message-id` and the value is a String representation of a long type
+`amqMessageId` and the value is a String representation of a long type
internal message id prefixed with `STOMP`, like:
```
-amq-message-id : STOMP12345
+amqMessageId : STOMP12345
```
-The default `stomp-enable-message-id` value is `false`.
+The default `stompEnableMessageId` value is `false`.
## Durable Subscriptions
@@ -281,7 +281,7 @@ message to a normal message, before sending it to the client.
If a large message is compressed, the server will uncompressed it before
sending it to stomp clients. The default value of `stompMinLargeMessageSize` is
the same as the default value of
-[min-large-message-size](large-messages.md#configuring-parameters).
+[minLargeMessageSize](large-messages.md#configuring-parameters).
## Web Sockets