Skip to content

Harden soTimeout vs InactivityMonitor - #2474

Merged
cshannon merged 2 commits into
apache:mainfrom
mattrpav:amq-sotimeout-fix
Aug 20, 2026
Merged

cshannon merged 2 commits into
apache:mainfrom
mattrpav:amq-sotimeout-fix

Conversation

@mattrpav

Copy link
Copy Markdown
Contributor

Harden soTimeout to not conflict with InactivityMonitor. The current TcpTransport read check doesn't count bytes received, only if it looped without blocking or throwing an exception.

@mattrpav
mattrpav requested a review from cshannon August 20, 2026 13:24
@mattrpav mattrpav self-assigned this Aug 20, 2026
@mattrpav mattrpav changed the title [#] soTimeout vs InactivityMonitor fix [#] Harden soTimeout vs InactivityMonitor Aug 20, 2026
@mattrpav
mattrpav force-pushed the amq-sotimeout-fix branch 3 times, most recently from 128d8c7 to c393b9a Compare August 20, 2026 13:50
Comment thread activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java Outdated
@mattrpav mattrpav changed the title [#] Harden soTimeout vs InactivityMonitor Harden soTimeout vs InactivityMonitor Aug 20, 2026

@cshannon cshannon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming tests are good

@cshannon
cshannon merged commit 4bdba72 into apache:main Aug 20, 2026
19 of 20 checks passed
@github-project-automation github-project-automation Bot moved this from Backlog to Done in Apache ActiveMQ v6.4.0 Aug 20, 2026
cshannon added a commit that referenced this pull request Aug 20, 2026
Fix receiveCounter counting read attempts instead of received data in TcpTransport

(cherry picked from commit 4bdba72)

Co-authored-by: Matt Pavlovich <mattrpav@apache.org>
@mattrpav
mattrpav deleted the amq-sotimeout-fix branch August 30, 2026 02:16
mattrpav pushed a commit to mattrpav/activemq that referenced this pull request Sep 2, 2026
Fix receiveCounter counting read attempts instead of received data in TcpTransport

(cherry picked from commit 4bdba72)

Co-authored-by: Matt Pavlovich <mattrpav@apache.org>
(cherry picked from commit 7ac224c)

* 5.19.x backport fixes
mattrpav added a commit that referenced this pull request Sep 2, 2026
Fix receiveCounter counting read attempts instead of received data in TcpTransport

(cherry picked from commit 4bdba72)

Co-authored-by: Matt Pavlovich <mattrpav@apache.org>
(cherry picked from commit 7ac224c)

* 5.19.x backport fixes

Co-authored-by: Christopher L. Shannon <cshannon@apache.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants