You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/02/05 20:51:39 UTC
[activemq-artemis] 02/03: ARTEMIS-2244 Adding critical check around
checkDepage
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit e09ffe14f488efd1013005da9ecc588466dc2905
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Tue Feb 5 15:15:10 2019 -0500
ARTEMIS-2244 Adding critical check around checkDepage
---
.../apache/activemq/artemis/core/server/impl/QueueImpl.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index a61a3d6..9d1988f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -112,11 +112,12 @@ import org.jboss.logging.Logger;
*/
public class QueueImpl extends CriticalComponentImpl implements Queue {
- protected static final int CRITICAL_PATHS = 4;
+ protected static final int CRITICAL_PATHS = 5;
protected static final int CRITICAL_PATH_ADD_TAIL = 0;
protected static final int CRITICAL_PATH_ADD_HEAD = 1;
protected static final int CRITICAL_DELIVER = 2;
protected static final int CRITICAL_CONSUMER = 3;
+ protected static final int CRITICAL_CHECK_DEPAGE = 4;
private static final Logger logger = Logger.getLogger(QueueImpl.class);
private static final AtomicIntegerFieldUpdater dispatchingUpdater = AtomicIntegerFieldUpdater.newUpdater(QueueImpl.class, "dispatching");
@@ -3433,7 +3434,12 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
}
if (needCheckDepage) {
- checkDepage();
+ enterCritical(CRITICAL_CHECK_DEPAGE);
+ try {
+ checkDepage();
+ } finally {
+ leaveCritical(CRITICAL_CHECK_DEPAGE);
+ }
}
} catch (Exception e) {