qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject qpid-broker-j git commit: QPID-7753: [AMQP1.0] Fix QpidByteBuffer leak of data sections
Date Thu, 04 May 2017 14:55:18 GMT
Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 2c0e54fd1 -> 7f9cc7573


QPID-7753: [AMQP1.0] Fix QpidByteBuffer leak of data sections


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/7f9cc757
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/7f9cc757
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/7f9cc757

Branch: refs/heads/master
Commit: 7f9cc7573892f88ba8adc690f06a3229d5235b0a
Parents: 2c0e54f
Author: Keith Wall <kwall@apache.org>
Authored: Thu May 4 15:54:25 2017 +0100
Committer: Keith Wall <kwall@apache.org>
Committed: Thu May 4 15:54:25 2017 +0100

----------------------------------------------------------------------
 .../org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java  | 2 +-
 .../qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7f9cc757/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
index f84eeb8..9f2ad67 100755
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
@@ -286,7 +286,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
         if (_messageAnnotationsSection != null)
         {
             _messageAnnotationsSection.dispose();
-            _deliveryAnnotationsSection = null;
+            _messageAnnotationsSection = null;
         }
         if (_propertiesSection != null)
         {

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7f9cc757/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
index 53fedb9..351f0b6 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
@@ -181,6 +181,7 @@ public class StandardReceivingLinkEndpoint extends AbstractReceivingLinkEndpoint
                         handle.addContent(buf);
                         buf.dispose();
                     }
+                    dataSection.dispose();
                 }
                 final StoredMessage<MessageMetaData_1_0> storedMessage = handle.allContentAdded();
                 Message_1_0 message = new Message_1_0(storedMessage, getSession().getConnection().getReference());
@@ -376,6 +377,7 @@ public class StandardReceivingLinkEndpoint extends AbstractReceivingLinkEndpoint
         MessageAnnotationsSection messageAnnotationsSection = null;
         ApplicationPropertiesSection applicationPropertiesSection = null;
         FooterSection footerSection = null;
+
         Iterator<EncodingRetainingSection<?>> iter = sections.iterator();
         EncodingRetainingSection<?> s = iter.hasNext() ? iter.next() : null;
         if (s instanceof HeaderSection)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message