You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/10/09 13:27:17 UTC
[3/3] qpid-broker-j git commit: QPID-7958: [Java Broker] [AMQP
Management] Dispose converted message on the incoming request path
QPID-7958: [Java Broker] [AMQP Management] Dispose converted message on the incoming request path
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/bd5b9514
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/bd5b9514
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/bd5b9514
Branch: refs/heads/master
Commit: bd5b951470d2c78392cdbc8e09811c6922a464ef
Parents: 0a447b6
Author: Lorenz Quack <lq...@apache.org>
Authored: Mon Oct 9 14:26:53 2017 +0100
Committer: Lorenz Quack <lq...@apache.org>
Committed: Mon Oct 9 14:26:53 2017 +0100
----------------------------------------------------------------------
.../server/management/amqp/ManagementNode.java | 23 +++++++++++---------
1 file changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/bd5b9514/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
index 4790b78..8efb2af 100644
--- a/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
+++ b/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
@@ -395,16 +395,8 @@ class ManagementNode implements MessageSource, MessageDestination, BaseQueue
{
}
- private synchronized void enqueue(InternalMessage message,
- Action<? super MessageInstance> postEnqueueAction)
+ private synchronized void processRequest(InternalMessage message)
{
- if(postEnqueueAction != null)
- {
- postEnqueueAction.performAction(new ConsumedMessageInstance(message));
- }
-
-
-
String id = (String) message.getMessageHeader().getHeader(IDENTITY_ATTRIBUTE);
String type = (String) message.getMessageHeader().getHeader(TYPE_ATTRIBUTE);
String operation = (String) message.getMessageHeader().getHeader(OPERATION_HEADER);
@@ -444,7 +436,18 @@ class ManagementNode implements MessageSource, MessageDestination, BaseQueue
final InternalMessage msg = converter.convert(message, _addressSpace);
- enqueue(msg, action);
+ try
+ {
+ if (action != null)
+ {
+ action.performAction(new ConsumedMessageInstance(msg));
+ }
+ processRequest(msg);
+ }
+ finally
+ {
+ converter.dispose(msg);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org