[activemq-artemis] branch master updated: ARTEMIS-2385 Log header for rejecting message with too large header

[nigrofranz]

This is an automated email from the ASF dual-hosted git repository.

nigrofranz 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 d14c0de  ARTEMIS-2385 Log header for rejecting message with too large 
header
     new 7e6efb2  This closes #2721
d14c0de is described below

commit d14c0de3356897c30ca20b96cf8089051674426b
Author: brusdev <bruscin...@gmail.com>
AuthorDate: Thu Jun 20 16:20:11 2019 +0200

    ARTEMIS-2385 Log header for rejecting message with too large header
    
    Fix test and warning condition to avoid false issues.
---
 .../activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java | 5 ++++-
 .../artemis/protocol/amqp/proton/AMQPConnectionContextTest.java      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
index 3790f36..35ea4f5 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContext.java
@@ -196,8 +196,11 @@ public class AMQPConnectionContext extends 
ProtonInitializable implements EventH
 
          if (scheduledPool != null && scheduledPool instanceof 
ThreadPoolExecutor &&
             scheduledFuture != null && scheduledFuture instanceof Runnable) {
-            if (!((ThreadPoolExecutor) scheduledPool).remove((Runnable) 
scheduledFuture)) {
+            if (!((ThreadPoolExecutor) scheduledPool).remove((Runnable) 
scheduledFuture) &&
+               !scheduledFuture.isCancelled() && !scheduledFuture.isDone()) {
                log.warn("Scheduled task can't be removed from scheduledPool.");
+            } else {
+               scheduledFuture = null;
             }
          }
       }
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContextTest.java
 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContextTest.java
index 8bdda7e..13b0258 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContextTest.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/test/java/org/apache/activemq/artemis/protocol/amqp/proton/AMQPConnectionContextTest.java
@@ -81,6 +81,6 @@ public class AMQPConnectionContextTest {
 
       connectionContext.close(null);
 
-      Assert.assertEquals(0, scheduledPool.getTaskCount());
+      Assert.assertEquals(0, scheduledPool.getQueue().size());
    }
 }