Github user mtaylor commented on a diff in the pull request:
https://github.com/apache/activemq-artemis/pull/690#discussion_r73357642
--- Diff:
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ProtonSessionIntegrationCallback.java
---
@@ -351,18 +353,35 @@ public void serverSend(final Receiver receiver,
recoverContext();
PagingStore store =
manager.getServer().getPagingManager().getPageStore(message.getAddress());
- if (store.isFull() && store.getAddressFullMessagePolicy() ==
AddressFullMessagePolicy.BLOCK) {
- ErrorCondition ec = new
ErrorCondition(AmqpError.RESOURCE_LIMIT_EXCEEDED, "Address is full: " +
message.getAddress());
- Rejected rejected = new Rejected();
- rejected.setError(ec);
- delivery.disposition(rejected);
- connection.flush();
+ if (store.isRejectingMessages()) {
+ // We drop pre-settled messages (and abort any associated Tx)
+ if (delivery.remotelySettled()) {
+ if (serverSession.getCurrentTransaction() != null) {
+ rollbackCurrentTX(false);
+
+ // Spec requires closure of coordinator link on rejection
of presettled messages within a tx
--- End diff --
@gemmellr The comment is there just to show why the method behaves in this
way, I didn't add all options. But, given your feedback, I think it's worth
changing this to option 2. I'll update the PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
