You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/08/15 10:11:42 UTC
qpid-broker-j git commit: QPID-7815: [Java Broker] Address review
comments from Lorenz Quack
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 175829a6c -> e792cccb7
QPID-7815: [Java Broker] Address review comments from Lorenz Quack
* call RejectPolicyHandler#addMessageDeleteListener from the constructor instead of duplicating the code.
* remove RejectPolicyHandler#onQueueOpen and the call to it from AbstractQueue#onOpen.
* move creation of RejectPolicyHandler to AbstractQueue#createOverflowPolicyHandlers
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/e792cccb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/e792cccb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/e792cccb
Branch: refs/heads/master
Commit: e792cccb76c06d57684b362be48b653d81fd651b
Parents: 175829a
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Aug 15 11:10:27 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Aug 15 11:10:27 2017 +0100
----------------------------------------------------------------------
.../apache/qpid/server/queue/AbstractQueue.java | 21 +++++++-------------
.../qpid/server/queue/RejectPolicyHandler.java | 11 +---------
2 files changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e792cccb/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index a6e7386..a5e5e65 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -577,19 +577,14 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
}
}
- OverflowPolicy overflowPolicy = getOverflowPolicy();
- _postEnqueueOverflowPolicyHandler = createPostEnqueueOverflowPolicyHandler(overflowPolicy);
- if (overflowPolicy == OverflowPolicy.REJECT)
- {
- _rejectPolicyHandler = new RejectPolicyHandler(this);
- _rejectPolicyHandler.onQueueOpen();
- }
+ createOverflowPolicyHandlers(_overflowPolicy);
updateAlertChecks();
}
- private OverflowPolicyHandler createPostEnqueueOverflowPolicyHandler(final OverflowPolicy overflowPolicy)
+ private void createOverflowPolicyHandlers(final OverflowPolicy overflowPolicy)
{
+ RejectPolicyHandler rejectPolicyHandler = null;
OverflowPolicyHandler overflowPolicyHandler;
switch (overflowPolicy)
{
@@ -607,13 +602,15 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
break;
case REJECT:
overflowPolicyHandler = new NoneOverflowPolicyHandler();
+ rejectPolicyHandler = new RejectPolicyHandler(this);
break;
default:
throw new IllegalStateException(String.format("Overflow policy '%s' is not implemented",
overflowPolicy.name()));
}
- return overflowPolicyHandler;
+ _rejectPolicyHandler = rejectPolicyHandler;
+ _postEnqueueOverflowPolicyHandler = overflowPolicyHandler;
}
protected LogMessage getCreatedLogMessage()
@@ -3112,11 +3109,7 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
{
_rejectPolicyHandler = null;
}
- _postEnqueueOverflowPolicyHandler = createPostEnqueueOverflowPolicyHandler(_overflowPolicy);
- if (_overflowPolicy == OverflowPolicy.REJECT)
- {
- _rejectPolicyHandler = new RejectPolicyHandler(this);
- }
+ createOverflowPolicyHandlers(_overflowPolicy);
_postEnqueueOverflowPolicyHandler.checkOverflow(null);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/e792cccb/broker-core/src/main/java/org/apache/qpid/server/queue/RejectPolicyHandler.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/RejectPolicyHandler.java b/broker-core/src/main/java/org/apache/qpid/server/queue/RejectPolicyHandler.java
index 359e17b..d81e1d2 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/RejectPolicyHandler.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/RejectPolicyHandler.java
@@ -41,11 +41,7 @@ public class RejectPolicyHandler
RejectPolicyHandler(final Queue<?> queue)
{
_handler = new Handler(queue);
- MessageStore messageStore = _handler.getMessageStore();
- if (messageStore != null)
- {
- messageStore.addMessageDeleteListener(_handler);
- }
+ addMessageDeleteListener();
queue.addChangeListener(_handler);
}
@@ -64,11 +60,6 @@ public class RejectPolicyHandler
_handler.postEnqueue(instance);
}
- void onQueueOpen()
- {
- addMessageDeleteListener();
- }
-
private void addMessageDeleteListener()
{
MessageStore messageStore = _handler.getMessageStore();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org