Author: kwall
Date: Tue Oct  4 16:34:24 2016
New Revision: 1763296

URL: http://svn.apache.org/viewvc?rev=1763296&view=rev
Log:
QPID-7447: [Java Broker] Avoid iterator garbage with 
NonBlockingConnection#getBufferedSize if no buffers remain

Modified:
    
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java

Modified: 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1763296&r1=1763295&r2=1763296&view=diff
==============================================================================
--- 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
 (original)
+++ 
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
 Tue Oct  4 16:34:24 2016
@@ -384,7 +384,12 @@ public class NonBlockingConnection imple
 
     private long getBufferedSize()
     {
-        long totalSize = 0l;
+        // Avoids iterator garbage if empty
+        if (_buffers.isEmpty())
+        {
+            return 0L;
+        }
+        long totalSize = 0L;
         for(QpidByteBuffer buf : _buffers)
         {
             totalSize += buf.remaining();



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to