franz1981 commented on a change in pull request #2727: ARTEMIS-2394 Improve
scheduling sync for AMQPConnectionContext
URL: https://github.com/apache/activemq-artemis/pull/2727#discussion_r304885552
##########
File path:
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
##########
@@ -416,42 +414,57 @@ public void onRemoteOpen(Connection connection) throws
Exception {
* */
if (connection.getRemoteProperties() == null ||
!connection.getRemoteProperties().containsKey(CONNECTION_OPEN_FAILED)) {
long nextKeepAliveTime = handler.tick(true);
- synchronized (schedulingLock) {
- if (nextKeepAliveTime != 0 && scheduledPool != null &&
!isSchedulingCancelled) {
- scheduledFuture = scheduledPool.schedule(new
ScheduleRunnable(), (nextKeepAliveTime -
TimeUnit.NANOSECONDS.toMillis(System.nanoTime())), TimeUnit.MILLISECONDS);
- }
+
+ if (nextKeepAliveTime != 0 && scheduledPool != null) {
+ scheduleOp.setDelay(nextKeepAliveTime -
TimeUnit.NANOSECONDS.toMillis(System.nanoTime()));
+
+ scheduledFutureRef.getAndUpdate(scheduleOp);
Review comment:
there is some specific return value from getOrUpdate that you expect to
find? if yes, maybe you can put an assert there to help spot issues on tests...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
