You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/08/20 13:23:39 UTC
svn commit: r1696761 [1/2] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/
broker-core/src/main/java/org/apache/qpid/server/message/internal/ b...
Author: kwall
Date: Thu Aug 20 11:23:38 2015
New Revision: 1696761
URL: http://svn.apache.org/r1696761
Log:
QPID-6662: [Java Broker] Explicitly dispose of QpidByteBuffers (to return them to the pool earlier and have fewer direct byte buffer allocations)
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/MessageTransfer.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/Method.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/Disassembler.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/sasl/SASLSender.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/network/security/ssl/SSLSender.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/util/Functions.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/util/ByteBufferUtils.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java Thu Aug 20 11:23:38 2015
@@ -527,7 +527,7 @@ public abstract class AbstractBDBMessage
ByteBuffer dst = ByteBuffer.wrap(data);
for(QpidByteBuffer buf : contentBody)
{
- buf.duplicate().get(dst);
+ buf.copyTo(dst);
}
value.setData(data);
try
@@ -1092,7 +1092,7 @@ public abstract class AbstractBDBMessage
for(QpidByteBuffer contentChunk : allContent)
{
length += contentChunk.remaining();
- contentChunk.duplicate().get(dst);
+ contentChunk.copyTo(dst);
}
return length;
}
@@ -1139,13 +1139,7 @@ public abstract class AbstractBDBMessage
final int remaining = buf.remaining();
if(pos+ remaining >=offsetInMessage)
{
- buf = buf.slice();
- buf.position(offsetInMessage-pos);
- buf = buf.slice();
- if(buf.remaining()>size)
- {
- buf.limit(size);
- }
+ buf = buf.view(offsetInMessage-pos,size);
content.add(buf);
added += buf.remaining();
@@ -1254,10 +1248,22 @@ public abstract class AbstractBDBMessage
public void remove()
{
checkMessageStoreOpen();
+ Collection<QpidByteBuffer> data = _messageDataRef.getData();
- int delta = getMetaData().getContentSize();
+ final T metaData = getMetaData();
+ int delta = metaData.getContentSize();
removeMessage(_messageId, false);
storedSizeChangeOccurred(-delta);
+ if(data != null)
+ {
+ _messageDataRef.setData(null);
+ for(QpidByteBuffer buf : data)
+ {
+ buf.dispose();
+ }
+ }
+ metaData.dispose();
+ _messageDataRef = null;
}
@Override
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ByteBufferBinding.java Thu Aug 20 11:23:38 2015
@@ -71,14 +71,15 @@ public class ByteBufferBinding extends T
@Override
public void objectToEntry(QpidByteBuffer data, final TupleOutput output)
{
- data = data.duplicate();
+ QpidByteBuffer dup = data.duplicate();
byte[] copyBuf = COPY_BUFFER.get();
- while(data.hasRemaining())
+ while(dup.hasRemaining())
{
- int length = Math.min(COPY_BUFFER_SIZE, data.remaining());
- data.get(copyBuf,0,length);
+ int length = Math.min(COPY_BUFFER_SIZE, dup.remaining());
+ dup.get(copyBuf,0,length);
output.write(copyBuf,0,length);
}
+ dup.dispose();
}
public ByteBuffer readByteBuffer(final TupleInput input, int length)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/message/internal/InternalMessageMetaData.java Thu Aug 20 11:23:38 2015
@@ -88,6 +88,12 @@ public class InternalMessageMetaData imp
return _isPersistent;
}
+ @Override
+ public void dispose()
+ {
+
+ }
+
static InternalMessageMetaData create(boolean persistent, final InternalMessageHeader header, int contentSize)
{
return new InternalMessageMetaData(persistent, header, contentSize);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/AbstractJDBCMessageStore.java Thu Aug 20 11:23:38 2015
@@ -1109,9 +1109,11 @@ public abstract class AbstractJDBCMessag
{
stmt = conn.prepareStatement(INSERT_INTO_MESSAGE_CONTENT);
- stmt.setLong(1,messageId);
- stmt.setBinaryStream(2, src.duplicate().asInputStream(), src.remaining());
+ stmt.setLong(1, messageId);
+ final QpidByteBuffer buffer = src.duplicate();
+ stmt.setBinaryStream(2, buffer.asInputStream(), src.remaining());
stmt.executeUpdate();
+ buffer.dispose();
}
catch (SQLException e)
{
@@ -1607,11 +1609,13 @@ public abstract class AbstractJDBCMessag
else
{
int size = data.remaining() + src.remaining();
- QpidByteBuffer buf = data.isDirect() ? QpidByteBuffer.allocateDirect(size) : QpidByteBuffer.allocate(size);
- buf.put(data.duplicate());
- buf.put(src.duplicate());
+ QpidByteBuffer buf = QpidByteBuffer.allocateDirect(size);
+ buf.putCopyOf(data);
+ buf.putCopyOf(src);
buf.flip();
+ src.dispose();
_messageDataRef.setData(buf);
+ data.dispose();
}
}
@@ -1679,10 +1683,20 @@ public abstract class AbstractJDBCMessag
{
getLogger().debug("REMOVE called on message: {}", _messageId);
checkMessageStoreOpen();
+ QpidByteBuffer data = _messageDataRef.getData();
- int delta = getMetaData().getContentSize();
+ final T metaData = getMetaData();
+ int delta = metaData.getContentSize();
AbstractJDBCMessageStore.this.removeMessage(_messageId);
storedSizeChange(-delta);
+
+ if(data != null)
+ {
+ _messageDataRef.setData(null);
+ data.dispose();
+ }
+ metaData.dispose();
+ _messageDataRef = null;
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StorableMessageMetaData.java Thu Aug 20 11:23:38 2015
@@ -34,5 +34,7 @@ public interface StorableMessageMetaData
int getContentSize();
boolean isPersistent();
+
+ void dispose();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/StoredMemoryMessage.java Thu Aug 20 11:23:38 2015
@@ -31,7 +31,7 @@ public class StoredMemoryMessage<T exten
{
private final long _messageNumber;
private QpidByteBuffer _content;
- private final T _metaData;
+ private T _metaData;
public StoredMemoryMessage(long messageNumber, T metaData)
{
@@ -55,7 +55,7 @@ public class StoredMemoryMessage<T exten
{
if(_content.remaining() >= src.remaining())
{
- _content.put(src.duplicate());
+ _content.putCopyOf(src);
}
else
{
@@ -67,7 +67,8 @@ public class StoredMemoryMessage<T exten
oldContent.flip();
_content = QpidByteBuffer.allocateDirect(size);
_content.put(oldContent);
- _content.put(src.duplicate());
+ _content.putCopyOf(src);
+ oldContent.dispose();
}
}
@@ -100,7 +101,7 @@ public class StoredMemoryMessage<T exten
src.get(dst);
-
+ src.dispose();
return length;
}
@@ -130,6 +131,13 @@ public class StoredMemoryMessage<T exten
public void remove()
{
+ _metaData.dispose();
+ _metaData = null;
+ if (_content != null)
+ {
+ _content.dispose();
+ _content = null;
+ }
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java Thu Aug 20 11:23:38 2015
@@ -392,10 +392,11 @@ public class MultiVersionProtocolEngine
public void received(QpidByteBuffer msg)
{
_lastReadTime = System.currentTimeMillis();
- QpidByteBuffer msgheader = msg.duplicate().slice();
+ QpidByteBuffer msgheader = msg.slice();
if(_header.remaining() > msgheader.limit())
{
+ msgheader.dispose();
return;
}
else
@@ -406,6 +407,8 @@ public class MultiVersionProtocolEngine
_header.put(msgheader);
+ msgheader.dispose();
+
if(!_header.hasRemaining())
{
_header.flip();
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=1696761&r1=1696760&r2=1696761&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 Thu Aug 20 11:23:38 2015
@@ -287,6 +287,12 @@ public class NonBlockingConnection imple
{
LOGGER.info("Exception closing socket '{}': {}", _remoteSocketAddress, e.getMessage());
}
+
+ if (SystemUtils.isWindows())
+ {
+ _delegate.shutdownInput();
+ _delegate.shutdownOutput();
+ }
}
}
@@ -306,21 +312,26 @@ public class NonBlockingConnection imple
private void shutdownOutput()
{
- try
+ if(!SystemUtils.isWindows())
{
- if(!SystemUtils.isWindows())
+ try
{
_socketChannel.shutdownOutput();
}
- }
- catch (IOException e)
- {
- LOGGER.info("Exception closing socket '{}': {}", _remoteSocketAddress, e.getMessage());
+ catch (IOException e)
+ {
+ LOGGER.info("Exception closing socket '{}': {}", _remoteSocketAddress, e.getMessage());
+ }
+ finally
+ {
+ _delegate.shutdownOutput();
+ }
}
}
private void shutdownInput()
{
+
if(!SystemUtils.isWindows())
{
try
@@ -331,6 +342,10 @@ public class NonBlockingConnection imple
{
LOGGER.info("Exception shutting down input for '{}': {}", _remoteSocketAddress, e.getMessage());
}
+ finally
+ {
+ _delegate.shutdownInput();
+ }
}
}
@@ -373,6 +388,7 @@ public class NonBlockingConnection imple
break;
}
_buffers.poll();
+ buf.dispose();
}
return result;
@@ -407,8 +423,9 @@ public class NonBlockingConnection imple
}
else if (msg.remaining() > 0)
{
- _buffers.add(msg);
+ _buffers.add(msg.duplicate());
}
+ msg.position(msg.limit());
}
@Override
@@ -457,6 +474,7 @@ public class NonBlockingConnection imple
QpidByteBuffer src = oldDelegate.getNetInputBuffer().duplicate();
src.flip();
_delegate.getNetInputBuffer().put(src);
+ src.dispose();
}
LOGGER.debug("Identified transport encryption as " + transportEncryption);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionDelegate.java Thu Aug 20 11:23:38 2015
@@ -43,4 +43,7 @@ interface NonBlockingConnectionDelegate
QpidByteBuffer getNetInputBuffer();
+ void shutdownInput();
+
+ void shutdownOutput();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionPlainDelegate.java Thu Aug 20 11:23:38 2015
@@ -36,7 +36,7 @@ public class NonBlockingConnectionPlainD
private static final Logger LOGGER = LoggerFactory.getLogger(NonBlockingConnectionPlainDelegate.class);
private final NonBlockingConnection _parent;
- private QpidByteBuffer _netInputBuffer;
+ private volatile QpidByteBuffer _netInputBuffer;
public NonBlockingConnectionPlainDelegate(NonBlockingConnection parent)
{
@@ -65,7 +65,9 @@ public class NonBlockingConnectionPlainD
protected void restoreApplicationBufferForWrite()
{
- _netInputBuffer = _netInputBuffer.slice();
+ QpidByteBuffer oldNetInputBuffer = _netInputBuffer;
+ _netInputBuffer = oldNetInputBuffer.slice();
+ oldNetInputBuffer.dispose();
if (_netInputBuffer.limit() != _netInputBuffer.capacity())
{
_netInputBuffer.position(_netInputBuffer.limit());
@@ -80,6 +82,7 @@ public class NonBlockingConnectionPlainD
_netInputBuffer = QpidByteBuffer.allocateDirect(newBufSize);
_netInputBuffer.put(currentBuffer);
+ currentBuffer.dispose();
}
}
@@ -123,4 +126,19 @@ public class NonBlockingConnectionPlainD
return _netInputBuffer;
}
+ @Override
+ public void shutdownInput()
+ {
+ if (_netInputBuffer != null)
+ {
+ _netInputBuffer.dispose();
+ _netInputBuffer = null;
+ }
+ }
+
+ @Override
+ public void shutdownOutput()
+ {
+
+ }
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionTLSDelegate.java Thu Aug 20 11:23:38 2015
@@ -135,7 +135,16 @@ public class NonBlockingConnectionTLSDel
public boolean doWrite(Collection<QpidByteBuffer> bufferArray) throws IOException
{
final int bufCount = bufferArray.size();
- int byteBuffersWritten = wrapBufferArray(bufferArray);
+ wrapBufferArray(bufferArray);
+
+ boolean bufsSent = true;
+ final Iterator<QpidByteBuffer> itr = bufferArray.iterator();
+ int bufIndex = 0;
+ while(itr.hasNext() && bufsSent && bufIndex++ < bufCount)
+ {
+ QpidByteBuffer buf = itr.next();
+ bufsSent = !buf.hasRemaining();
+ }
_parent.writeToTransport(_encryptedOutput);
@@ -145,6 +154,7 @@ public class NonBlockingConnectionTLSDel
QpidByteBuffer buf = iter.next();
if(buf.remaining() == 0)
{
+ buf.dispose();
iter.remove();
}
else
@@ -153,12 +163,14 @@ public class NonBlockingConnectionTLSDel
}
}
- return (bufCount <= byteBuffersWritten) && _encryptedOutput.isEmpty();
+ return bufsSent && _encryptedOutput.isEmpty();
}
protected void restoreApplicationBufferForWrite()
{
+ QpidByteBuffer oldApplicationBuffer = _applicationBuffer;
_applicationBuffer = _applicationBuffer.slice();
+ oldApplicationBuffer.dispose();
if (_applicationBuffer.limit() != _applicationBuffer.capacity())
{
_applicationBuffer.position(_applicationBuffer.limit());
@@ -173,13 +185,13 @@ public class NonBlockingConnectionTLSDel
_applicationBuffer = QpidByteBuffer.allocateDirect(newBufSize);
_applicationBuffer.put(currentBuffer);
+ currentBuffer.dispose();
}
}
- private int wrapBufferArray(Collection<QpidByteBuffer> bufferArray) throws SSLException
+ private void wrapBufferArray(Collection<QpidByteBuffer> bufferArray) throws SSLException
{
- int byteBuffersWritten = 0;
int remaining = 0;
do
{
@@ -195,25 +207,14 @@ public class NonBlockingConnectionTLSDel
{
_encryptedOutput.add(netBuffer);
}
- Iterator<QpidByteBuffer> iter = bufferArray.iterator();
- while (iter.hasNext())
+ else
{
- QpidByteBuffer buf = iter.next();
- if (buf.remaining() == 0)
- {
- byteBuffersWritten++;
- iter.remove();
- }
- else
- {
- break;
- }
+ netBuffer.dispose();
}
}
}
while(remaining != 0 && _sslEngine.getHandshakeStatus() != SSLEngineResult.HandshakeStatus.NEED_UNWRAP);
- return byteBuffersWritten;
}
private boolean runSSLEngineTasks(final SSLEngineResult status)
@@ -300,4 +301,26 @@ public class NonBlockingConnectionTLSDel
return _netInputBuffer;
}
+ @Override
+ public void shutdownInput()
+ {
+ if (_netInputBuffer != null)
+ {
+ _netInputBuffer.dispose();
+ _netInputBuffer = null;
+ }
+
+ if (_applicationBuffer != null)
+ {
+ _applicationBuffer.dispose();
+ _applicationBuffer = null;
+ }
+ }
+
+ @Override
+ public void shutdownOutput()
+ {
+
+ }
+
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnectionUndecidedDelegate.java Thu Aug 20 11:23:38 2015
@@ -52,11 +52,11 @@ public class NonBlockingConnectionUndeci
{
QpidByteBuffer buffer = _netInputBuffer.duplicate();
buffer.flip();
- if (buffer.remaining() >= NUMBER_OF_BYTES_FOR_TLS_CHECK)
+ final boolean hasSufficientData = buffer.remaining() >= NUMBER_OF_BYTES_FOR_TLS_CHECK;
+ if (hasSufficientData)
{
final byte[] headerBytes = new byte[NUMBER_OF_BYTES_FOR_TLS_CHECK];
- QpidByteBuffer dup = buffer.duplicate();
- dup.get(headerBytes);
+ buffer.get(headerBytes);
if (looksLikeSSL(headerBytes))
{
@@ -67,9 +67,10 @@ public class NonBlockingConnectionUndeci
_parent.setTransportEncryption(TransportEncryption.NONE);
}
- return true;
+
}
- return false;
+ buffer.dispose();
+ return hasSufficientData;
}
@Override
@@ -128,4 +129,13 @@ public class NonBlockingConnectionUndeci
return _netInputBuffer;
}
+ @Override
+ public void shutdownInput()
+ {
+ }
+
+ @Override
+ public void shutdownOutput()
+ {
+ }
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaData.java Thu Aug 20 11:23:38 2015
@@ -78,6 +78,12 @@ public class TestMessageMetaData impleme
}
@Override
+ public void dispose()
+ {
+
+ }
+
+ @Override
public int writeToBuffer(ByteBuffer dest)
{
int oldPosition = dest.position();
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java Thu Aug 20 11:23:38 2015
@@ -281,6 +281,10 @@ public class ConsumerTarget_0_10 extends
if(uncompressed != null)
{
messageProps.setContentEncoding(null);
+ for (QpidByteBuffer buf : body)
+ {
+ buf.dispose();
+ }
body = Collections.singleton(QpidByteBuffer.wrap(uncompressed));
}
}
@@ -298,6 +302,10 @@ public class ConsumerTarget_0_10 extends
messageProps = new MessageProperties();
}
messageProps.setContentEncoding(GZIPUtils.GZIP_CONTENT_ENCODING);
+ for (QpidByteBuffer buf : body)
+ {
+ buf.dispose();
+ }
body = Collections.singleton(QpidByteBuffer.wrap(compressed));
}
}
@@ -306,18 +314,26 @@ public class ConsumerTarget_0_10 extends
xfr = batch ? new MessageTransfer(_name,_acceptMode,_acquireMode,header, body, BATCHED)
: new MessageTransfer(_name,_acceptMode,_acquireMode,header, body);
-
+ if (body != null)
+ {
+ for (QpidByteBuffer buf : body)
+ {
+ buf.dispose();
+ }
+ body = null;
+ }
if(_acceptMode == MessageAcceptMode.NONE && _acquireMode != MessageAcquireMode.PRE_ACQUIRED)
{
xfr.setCompletionListener(new MessageAcceptCompletionListener(this, consumer, _session, entry, _flowMode == MessageFlowMode.WINDOW));
}
else if(_flowMode == MessageFlowMode.WINDOW)
{
+ final long messageSize = entry.getMessage().getSize();
xfr.setCompletionListener(new Method.CompletionListener()
{
public void onComplete(Method method)
{
- deferredAddCredit(1, entry.getMessage().getSize());
+ deferredAddCredit(1, messageSize);
}
});
}
@@ -339,6 +355,7 @@ public class ConsumerTarget_0_10 extends
_session.sendMessage(xfr, _postIdSettingAction);
+ xfr.dispose();
_postIdSettingAction.setAction(null);
_postIdSettingAction.setXfr(null);
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java Thu Aug 20 11:23:38 2015
@@ -173,6 +173,12 @@ public class MessageMetaData_0_10 implem
return _deliveryProps == null ? false : _deliveryProps.getDeliveryMode() == MessageDeliveryMode.PERSISTENT;
}
+ @Override
+ public void dispose()
+ {
+
+ }
+
public String getRoutingKey()
{
return _deliveryProps == null ? null : _deliveryProps.getRoutingKey();
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerAssembler.java Thu Aug 20 11:23:38 2015
@@ -47,6 +47,7 @@ import org.apache.qpid.transport.codec.B
import org.apache.qpid.transport.network.Frame;
import org.apache.qpid.transport.network.NetworkDelegate;
import org.apache.qpid.transport.network.NetworkEvent;
+import org.apache.qpid.transport.util.Functions;
public class ServerAssembler
{
@@ -144,11 +145,11 @@ public class ServerAssembler
public void frame(ServerFrame frame)
{
- List<QpidByteBuffer> segment;
+ List<QpidByteBuffer> frameBuffers;
if (frame.isFirstFrame() && frame.isLastFrame())
{
- segment = Collections.singletonList(frame.getBody());
- assemble(frame, segment);
+ frameBuffers = Collections.singletonList(frame.getBody());
+ assemble(frame, frameBuffers);
}
else
{
@@ -168,21 +169,22 @@ public class ServerAssembler
if (frame.isLastFrame())
{
clearSegment(frame);
- segment = new ArrayList<>(frames.size());
+ frameBuffers = new ArrayList<>(frames.size());
for (ServerFrame f : frames)
{
- segment.add(f.getBody());
+
+ frameBuffers.add(f.getBody());
}
- assemble(frame, segment);
+ assemble(frame, frameBuffers);
}
}
}
- private void assemble(ServerFrame frame, List<QpidByteBuffer> segment)
+ private void assemble(ServerFrame frame, List<QpidByteBuffer> frameBuffers)
{
ServerDecoder dec = _decoder;
- dec.init(segment);
+ dec.init(frameBuffers);
int channel = frame.getChannel();
Method command;
@@ -248,15 +250,20 @@ public class ServerAssembler
break;
case BODY:
command = getIncompleteCommand(channel);
- command.setBody(segment);
+ command.setBody(frameBuffers);
setIncompleteCommand(channel, null);
emit(channel, command);
+
break;
default:
throw new IllegalStateException("unknown frame type: " + frame.getType());
}
dec.releaseBuffer();
+ for(QpidByteBuffer buf : frameBuffers)
+ {
+ buf.dispose();
+ }
}
private void setIncompleteCommand(int channelId, Method incomplete)
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java Thu Aug 20 11:23:38 2015
@@ -82,6 +82,7 @@ public final class ServerDecoder extends
buf.limit(remaining);
currentBuffer.position(currentBuffer.position()+remaining);
dest.put(buf);
+ buf.dispose();
}
else
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java Thu Aug 20 11:23:38 2015
@@ -49,6 +49,7 @@ import org.apache.qpid.transport.Segment
import org.apache.qpid.transport.Struct;
import org.apache.qpid.transport.codec.Encoder;
import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.transport.util.Functions;
/**
* Disassembler
@@ -95,7 +96,7 @@ public final class ServerDisassembler im
}
}
- private void frame(byte flags, byte type, byte track, int channel, int size, Collection<QpidByteBuffer> buf)
+ private void frame(byte flags, byte type, byte track, int channel, int size, Collection<QpidByteBuffer> buffers)
{
QpidByteBuffer data = QpidByteBuffer.allocate(HEADER_SIZE);
@@ -110,21 +111,22 @@ public final class ServerDisassembler im
if(size > 0)
{
int residual = size;
- for(QpidByteBuffer b : buf)
+ for(QpidByteBuffer b : buffers)
{
final int remaining = b.remaining();
if(remaining > 0 )
{
if(remaining >= residual)
{
- _sender.send(b.view(0,residual));
- b.position(b.position()+residual);
+ final QpidByteBuffer buffer = b.view(0, residual);
+ _sender.send(buffer);
+ buffer.dispose();
+ b.position(b.position() + residual);
break;
}
else
{
- _sender.send(b.duplicate());
- b.position(b.limit());
+ _sender.send(b);
residual-=remaining;
}
}
@@ -133,13 +135,13 @@ public final class ServerDisassembler im
}
- private void fragment(byte flags, SegmentType type, ProtocolEvent event, Collection<QpidByteBuffer> buf)
+ private void fragment(byte flags, SegmentType type, ProtocolEvent event, Collection<QpidByteBuffer> buffers)
{
byte typeb = (byte) type.getValue();
byte track = event.getEncodedTrack() == Frame.L4 ? (byte) 1 : (byte) 0;
int remaining = 0;
- for(QpidByteBuffer b : buf)
+ for(QpidByteBuffer b : buffers)
{
remaining += b.remaining();
}
@@ -160,7 +162,7 @@ public final class ServerDisassembler im
newflags |= LAST_FRAME;
}
- frame(newflags, typeb, track, event.getChannel(), size, buf);
+ frame(newflags, typeb, track, event.getChannel(), size, buffers);
if (remaining == 0)
{
@@ -253,12 +255,17 @@ public final class ServerDisassembler im
fragment(body == null ? LAST_SEG : 0x0, SegmentType.HEADER, method, Collections.singletonList(QpidByteBuffer.wrap(buf.duplicate())));
if (body != null)
{
- Collection<QpidByteBuffer> dup = new ArrayList<>();
+ Collection<QpidByteBuffer> dup = new ArrayList<>(body.size());
for(QpidByteBuffer b : body)
{
dup.add(b.duplicate());
}
fragment(LAST_SEG, SegmentType.BODY, method, dup);
+ for(QpidByteBuffer b : dup)
+ {
+ b.dispose();
+ }
+
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java Thu Aug 20 11:23:38 2015
@@ -68,7 +68,7 @@ public final class ServerFrame
public QpidByteBuffer getBody()
{
- return body.slice();
+ return body;
}
public byte getFlags()
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java Thu Aug 20 11:23:38 2015
@@ -157,7 +157,7 @@ public class ServerInputHandler implemen
buffer.position(buffer.position()+4);
if (size == 0)
{
- ServerFrame frame = new ServerFrame(flags, type, track, channel, EMPTY_BYTE_BUFFER);
+ ServerFrame frame = new ServerFrame(flags, type, track, channel, EMPTY_BYTE_BUFFER.duplicate());
_serverAssembler.received(frame);
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSessionDelegate.java Thu Aug 20 11:23:38 2015
@@ -382,118 +382,124 @@ public class ServerSessionDelegate exten
@Override
public void messageTransfer(Session ssn, final MessageTransfer xfr)
{
- ServerSession serverSession = (ServerSession) ssn;
- if(serverSession.blockingTimeoutExceeded())
+ try
{
- getVirtualHost(ssn).getEventLogger().message(ChannelMessages.FLOW_CONTROL_IGNORED());
-
- serverSession.close(AMQConstant.MESSAGE_TOO_LARGE,
- "Session flow control was requested, but not enforced by sender");
- }
- else if(xfr.getBodySize() > serverSession.getConnection().getMaxMessageSize())
- {
- exception(ssn, xfr, ExecutionErrorCode.RESOURCE_LIMIT_EXCEEDED,
- "Message size of " + xfr.getBodySize() + " greater than allowed maximum of " + serverSession.getConnection().getMaxMessageSize());
- }
- else
- {
- final MessageDestination destination = getDestinationForMessage(ssn, xfr);
-
- final DeliveryProperties delvProps =
- xfr.getHeader() == null ? null : xfr.getHeader().getDeliveryProperties();
- if (delvProps != null && delvProps.hasTtl() && !delvProps.hasExpiration())
+ ServerSession serverSession = (ServerSession) ssn;
+ if(serverSession.blockingTimeoutExceeded())
{
- delvProps.setExpiration(System.currentTimeMillis() + delvProps.getTtl());
- }
-
- final MessageMetaData_0_10 messageMetaData = new MessageMetaData_0_10(xfr);
+ getVirtualHost(ssn).getEventLogger().message(ChannelMessages.FLOW_CONTROL_IGNORED());
- final VirtualHostImpl virtualHost = getVirtualHost(ssn);
- try
+ serverSession.close(AMQConstant.MESSAGE_TOO_LARGE,
+ "Session flow control was requested, but not enforced by sender");
+ }
+ else if(xfr.getBodySize() > serverSession.getConnection().getMaxMessageSize())
{
- virtualHost.getSecurityManager()
- .authorisePublish(messageMetaData.isImmediate(),
- messageMetaData.getRoutingKey(),
- destination.getName(),
- virtualHost.getName());
+ exception(ssn, xfr, ExecutionErrorCode.RESOURCE_LIMIT_EXCEEDED,
+ "Message size of " + xfr.getBodySize() + " greater than allowed maximum of " + serverSession.getConnection().getMaxMessageSize());
}
- catch (AccessControlException e)
+ else
{
- ExecutionErrorCode errorCode = ExecutionErrorCode.UNAUTHORIZED_ACCESS;
- exception(ssn, xfr, errorCode, e.getMessage());
+ final MessageDestination destination = getDestinationForMessage(ssn, xfr);
- return;
- }
+ final DeliveryProperties delvProps =
+ xfr.getHeader() == null ? null : xfr.getHeader().getDeliveryProperties();
+ if (delvProps != null && delvProps.hasTtl() && !delvProps.hasExpiration())
+ {
+ delvProps.setExpiration(System.currentTimeMillis() + delvProps.getTtl());
+ }
- final MessageStore store = virtualHost.getMessageStore();
- final StoredMessage<MessageMetaData_0_10> storeMessage = createStoreMessage(xfr, messageMetaData, store);
- final MessageTransferMessage message =
- new MessageTransferMessage(storeMessage, serverSession.getReference());
- MessageReference<MessageTransferMessage> reference = message.newReference();
+ final MessageMetaData_0_10 messageMetaData = new MessageMetaData_0_10(xfr);
- try
- {
- final InstanceProperties instanceProperties = new InstanceProperties()
+ final VirtualHostImpl virtualHost = getVirtualHost(ssn);
+ try
+ {
+ virtualHost.getSecurityManager()
+ .authorisePublish(messageMetaData.isImmediate(),
+ messageMetaData.getRoutingKey(),
+ destination.getName(),
+ virtualHost.getName());
+ }
+ catch (AccessControlException e)
{
- @Override
- public Object getProperty(final Property prop)
+ ExecutionErrorCode errorCode = ExecutionErrorCode.UNAUTHORIZED_ACCESS;
+ exception(ssn, xfr, errorCode, e.getMessage());
+
+ return;
+ }
+
+ final MessageStore store = virtualHost.getMessageStore();
+ final StoredMessage<MessageMetaData_0_10> storeMessage = createStoreMessage(xfr, messageMetaData, store);
+ final MessageTransferMessage message =
+ new MessageTransferMessage(storeMessage, serverSession.getReference());
+ MessageReference<MessageTransferMessage> reference = message.newReference();
+
+ try
+ {
+ final InstanceProperties instanceProperties = new InstanceProperties()
{
- switch (prop)
+ @Override
+ public Object getProperty(final Property prop)
{
- case EXPIRATION:
- return message.getExpiration();
- case IMMEDIATE:
- return message.isImmediate();
- case MANDATORY:
- return (delvProps == null || !delvProps.getDiscardUnroutable())
- && xfr.getAcceptMode() == MessageAcceptMode.EXPLICIT;
- case PERSISTENT:
- return message.isPersistent();
- case REDELIVERED:
- return delvProps.getRedelivered();
+ switch (prop)
+ {
+ case EXPIRATION:
+ return message.getExpiration();
+ case IMMEDIATE:
+ return message.isImmediate();
+ case MANDATORY:
+ return (delvProps == null || !delvProps.getDiscardUnroutable())
+ && xfr.getAcceptMode() == MessageAcceptMode.EXPLICIT;
+ case PERSISTENT:
+ return message.isPersistent();
+ case REDELIVERED:
+ return delvProps.getRedelivered();
+ }
+ return null;
}
- return null;
- }
- };
+ };
- int enqueues = serverSession.enqueue(message, instanceProperties, destination);
+ int enqueues = serverSession.enqueue(message, instanceProperties, destination);
- if (enqueues == 0)
- {
- if ((delvProps == null || !delvProps.getDiscardUnroutable())
- && xfr.getAcceptMode() == MessageAcceptMode.EXPLICIT)
+ if (enqueues == 0)
+ {
+ if ((delvProps == null || !delvProps.getDiscardUnroutable())
+ && xfr.getAcceptMode() == MessageAcceptMode.EXPLICIT)
+ {
+ RangeSet rejects = RangeSetFactory.createRangeSet();
+ rejects.add(xfr.getId());
+ MessageReject reject = new MessageReject(rejects, MessageRejectCode.UNROUTABLE, "Unroutable");
+ ssn.invoke(reject);
+ }
+ else
+ {
+ virtualHost.getEventLogger().message(ExchangeMessages.DISCARDMSG(destination.getName(),
+ messageMetaData.getRoutingKey()));
+ }
+ }
+
+ if (serverSession.isTransactional())
{
- RangeSet rejects = RangeSetFactory.createRangeSet();
- rejects.add(xfr.getId());
- MessageReject reject = new MessageReject(rejects, MessageRejectCode.UNROUTABLE, "Unroutable");
- ssn.invoke(reject);
+ serverSession.processed(xfr);
}
else
{
- virtualHost.getEventLogger().message(ExchangeMessages.DISCARDMSG(destination.getName(),
- messageMetaData.getRoutingKey()));
+ serverSession.recordFuture(FutureResult.IMMEDIATE_FUTURE,
+ new CommandProcessedAction(serverSession, xfr));
}
}
-
- if (serverSession.isTransactional())
+ catch (VirtualHostUnavailableException e)
{
- serverSession.processed(xfr);
+ getServerConnection(serverSession).sendConnectionCloseAsync(AMQConstant.CONNECTION_FORCED, e.getMessage());
}
- else
+ finally
{
- serverSession.recordFuture(FutureResult.IMMEDIATE_FUTURE,
- new CommandProcessedAction(serverSession, xfr));
+ reference.release();
}
}
- catch (VirtualHostUnavailableException e)
- {
- getServerConnection(serverSession).sendConnectionCloseAsync(AMQConstant.CONNECTION_FORCED, e.getMessage());
- }
- finally
- {
- reference.release();
- }
-
+ }
+ finally
+ {
+ xfr.dispose();
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Thu Aug 20 11:23:38 2015
@@ -451,8 +451,9 @@ public class AMQChannel
for(int i = 0 ; i < bodyCount ; i++)
{
ContentBody contentChunk = _currentMessage.getContentChunk(i);
- handle.addContent(contentChunk.getPayload().duplicate());
+ handle.addContent(contentChunk.getPayload());
bodyLengthReceived += contentChunk.getSize();
+ contentChunk.dispose();
}
}
final StoredMessage<MessageMetaData> storedMessage = handle.allContentAdded();
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/MessageMetaData.java Thu Aug 20 11:23:38 2015
@@ -51,7 +51,7 @@ public class MessageMetaData implements
{
private final MessagePublishInfo _messagePublishInfo;
- private final ContentHeaderBody _contentHeaderBody;
+ private ContentHeaderBody _contentHeaderBody;
private long _arrivalTime;
@@ -151,6 +151,13 @@ public class MessageMetaData implements
return _contentHeaderBody.getProperties().getDeliveryMode() == BasicContentHeaderProperties.PERSISTENT;
}
+ @Override
+ public void dispose()
+ {
+ _contentHeaderBody.dispose();
+ _contentHeaderBody = null;
+ }
+
private static class MetaDataFactory implements MessageMetaDataType.Factory<MessageMetaData>
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/ProtocolOutputConverterImpl.java Thu Aug 20 11:23:38 2015
@@ -23,6 +23,7 @@ package org.apache.qpid.server.protocol.
import java.io.DataOutput;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -110,9 +111,14 @@ public class ProtocolOutputConverterImpl
// straight through case
boolean compressionSupported = _connection.isCompressionSupported();
- if(msgCompressed && !compressionSupported &&
- (modifiedContent = GZIPUtils.uncompressBufferToArray(
- ByteBufferUtils.combine(message.getContent(0, bodySize)))) != null)
+ Collection<QpidByteBuffer> buffers = null;
+
+ long length;
+ if(msgCompressed
+ && !compressionSupported
+ && ((buffers = message.getContent(0, bodySize)) != null)
+ && (modifiedContent = GZIPUtils.uncompressBufferToArray(
+ ByteBufferUtils.combine(buffers))) != null)
{
BasicContentHeaderProperties modifiedProps =
new BasicContentHeaderProperties(contentHeaderBody.getProperties());
@@ -120,14 +126,14 @@ public class ProtocolOutputConverterImpl
writeMessageDeliveryModified(channelId, deliverBody, modifiedProps, modifiedContent);
- return modifiedContent.length;
+ length = modifiedContent.length;
}
else if(!msgCompressed
&& compressionSupported
&& contentHeaderBody.getProperties().getEncoding()==null
&& bodySize > _connection.getMessageCompressionThreshold()
- && (modifiedContent = GZIPUtils.compressBufferToArray(ByteBufferUtils.combine(message.getContent(0,
- bodySize)))) != null)
+ && ((buffers = message.getContent(0, bodySize)) != null)
+ && (modifiedContent = GZIPUtils.compressBufferToArray(ByteBufferUtils.combine(buffers))) != null)
{
BasicContentHeaderProperties modifiedProps =
new BasicContentHeaderProperties(contentHeaderBody.getProperties());
@@ -135,14 +141,24 @@ public class ProtocolOutputConverterImpl
writeMessageDeliveryModified(channelId, deliverBody, modifiedProps, modifiedContent);
- return modifiedContent.length;
+ length = modifiedContent.length;
}
else
{
writeMessageDeliveryUnchanged(message, contentHeaderBody, channelId, deliverBody, bodySize);
- return bodySize;
+ length = bodySize;
+ }
+
+ if (buffers != null)
+ {
+ for (QpidByteBuffer buf : buffers)
+ {
+ buf.dispose();
+ }
}
+
+ return length;
}
private int writeMessageDeliveryModified(final int channelId,
@@ -278,7 +294,9 @@ public class ProtocolOutputConverterImpl
for(QpidByteBuffer buf : bufs)
{
size += buf.remaining();
- sender.send(buf.duplicate());
+
+ sender.send(buf);
+ buf.dispose();
}
return size;
}
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java Thu Aug 20 11:23:38 2015
@@ -380,8 +380,12 @@ public class MessageMetaData_1_0 impleme
return _messageHeader;
}
-
-
+ @Override
+ public void dispose()
+ {
+ _encoded.dispose();
+ _encoded = null;
+ }
private static class MetaDataFactory implements MessageMetaDataType.Factory<MessageMetaData_1_0>
{
Modified: qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java (original)
+++ qpid/java/trunk/broker-plugins/websocket/src/main/java/org/apache/qpid/server/transport/websocket/WebSocketProvider.java Thu Aug 20 11:23:38 2015
@@ -311,7 +311,9 @@ class WebSocketProvider implements Accep
else
{
byte[] copy = new byte[msg.remaining()];
- msg.duplicate().get(copy);
+ final QpidByteBuffer duplicate = msg.duplicate();
+ duplicate.get(copy);
+ duplicate.dispose();
_connection.sendMessage(copy, 0, copy.length);
}
}
Modified: qpid/java/trunk/client/src/test/java/org/apache/qpid/client/transport/MockSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/transport/MockSender.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/client/src/test/java/org/apache/qpid/client/transport/MockSender.java (original)
+++ qpid/java/trunk/client/src/test/java/org/apache/qpid/client/transport/MockSender.java Thu Aug 20 11:23:38 2015
@@ -28,11 +28,6 @@ import org.apache.qpid.transport.ByteBuf
public class MockSender implements ByteBufferSender
{
- private void send(ByteBuffer msg)
- {
-
- }
-
@Override
public void send(final QpidByteBuffer msg)
{
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.java Thu Aug 20 11:23:38 2015
@@ -31,7 +31,6 @@ import java.nio.charset.Charset;
import java.util.Collection;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
@@ -49,9 +48,11 @@ public final class QpidByteBuffer
{
private static final Logger LOGGER = LoggerFactory.getLogger(QpidByteBuffer.class);
- private static final AtomicIntegerFieldUpdater<QpidByteBuffer> DISPOSED_UPDATER = AtomicIntegerFieldUpdater.newUpdater(QpidByteBuffer.class, "_disposed");
+ private static final AtomicIntegerFieldUpdater<QpidByteBuffer> DISPOSED_UPDATER = AtomicIntegerFieldUpdater.newUpdater(
+ QpidByteBuffer.class,
+ "_disposed");
- private final ByteBuffer _buffer;
+ private ByteBuffer _buffer;
private final ByteBufferRef _ref;
@SuppressWarnings("unused")
private volatile int _disposed;
@@ -214,12 +215,21 @@ public final class QpidByteBuffer
return this;
}
- public QpidByteBuffer get(final ByteBuffer src)
+ public QpidByteBuffer get(final ByteBuffer dst)
{
- src.put(_buffer);
+ dst.put(_buffer);
return this;
}
+ public void copyTo(final ByteBuffer dst)
+ {
+ dst.put(_buffer.duplicate());
+ }
+
+ public void putCopyOf(final QpidByteBuffer buf)
+ {
+ _buffer.put(buf._buffer.duplicate());
+ }
public QpidByteBuffer rewind()
{
@@ -330,6 +340,12 @@ public final class QpidByteBuffer
return this;
}
+
+ public void copyTo(final byte[] dst)
+ {
+ _buffer.duplicate().get(dst);
+ }
+
public QpidByteBuffer putChar(final char value)
{
_buffer.putChar(value);
@@ -378,7 +394,7 @@ public final class QpidByteBuffer
ByteBuffer buf = _buffer.slice();
buf.position(offset);
buf = buf.slice();
- buf.limit(length);
+ buf.limit(Math.min(length, buf.remaining()));
return new QpidByteBuffer(buf, _ref);
}
@@ -405,6 +421,7 @@ public final class QpidByteBuffer
if(DISPOSED_UPDATER.compareAndSet(this,0,1))
{
_ref.decrementRef();
+ _buffer = null;
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicConsumeBody.java Thu Aug 20 11:23:38 2015
@@ -210,5 +210,9 @@ public class BasicConsumeBody extends AM
{
dispatcher.receiveBasicConsume(queue, consumerTag, noLocal, noAck, exclusive, nowait, arguments);
}
+ if (arguments != null)
+ {
+ arguments.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/BasicContentHeaderProperties.java Thu Aug 20 11:23:38 2015
@@ -247,7 +247,7 @@ public class BasicContentHeaderPropertie
else
{
array = new byte[length];
- _encodedForm.duplicate().get(array);
+ _encodedForm.copyTo(array);
offset = 0;
}
buffer.write(array, offset, length);
@@ -362,7 +362,7 @@ public class BasicContentHeaderPropertie
{
int fieldTableLength = input.readInt();
- _headers = new FieldTable(input.readAsByteBuffer(fieldTableLength));
+ _headers = new FieldTable(input, fieldTableLength);
length += 4;
length += fieldTableLength;
@@ -475,7 +475,9 @@ public class BasicContentHeaderPropertie
{
if(useEncodedForm())
{
- sender.send(_encodedForm.duplicate());
+ final QpidByteBuffer duplicate = _encodedForm.duplicate();
+ sender.send(duplicate);
+ duplicate.dispose();
return _encodedForm.remaining();
}
else
@@ -485,6 +487,7 @@ public class BasicContentHeaderPropertie
writePropertyListPayload(buf.asDataOutput());
buf.flip();
sender.send(buf);
+ buf.dispose();
return propertyListSize;
}
@@ -501,7 +504,9 @@ public class BasicContentHeaderPropertie
_encodedForm = buffer.readAsByteBuffer(size);
- decode(_encodedForm.slice().asDataInput());
+ final QpidByteBuffer byteBuffer = _encodedForm.slice();
+ decode(byteBuffer.asDataInput());
+ byteBuffer.dispose();
}
@@ -525,12 +530,9 @@ public class BasicContentHeaderPropertie
{
long length = EncodingUtils.readUnsignedInteger(buffer);
- QpidByteBuffer buf = _encodedForm.slice();
- buf.position(headersOffset+4);
- buf = buf.slice();
- buf.limit((int)length);
+ QpidByteBuffer buf = _encodedForm.view(headersOffset+4, (int)length);
_headers = new FieldTable(buf);
-
+ buf.dispose();
buffer.skipBytes((int)length);
}
@@ -949,4 +951,17 @@ public class BasicContentHeaderPropertie
}
+ public void dispose()
+ {
+ if(_encodedForm != null)
+ {
+ _encodedForm.dispose();
+ _encodedForm = null;
+ }
+ if(_headers != null)
+ {
+ _headers.dispose();
+ _headers = null;
+ }
+ }
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ChannelAlertBody.java Thu Aug 20 11:23:38 2015
@@ -133,5 +133,9 @@ public class ChannelAlertBody extends AM
{
dispatcher.receiveChannelAlert(replyCode, replyText, details);
}
+ if (details != null)
+ {
+ details.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartBody.java Thu Aug 20 11:23:38 2015
@@ -149,5 +149,9 @@ public class ConnectionStartBody extends
{
dispatcher.receiveConnectionStart(versionMajor, versionMinor, serverProperties, mechanisms, locales);
}
+ if (serverProperties != null)
+ {
+ serverProperties.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ConnectionStartOkBody.java Thu Aug 20 11:23:38 2015
@@ -138,5 +138,9 @@ public class ConnectionStartOkBody exten
{
dispatcher.receiveConnectionStartOk(clientProperties, mechanism, response, locale);
}
+ if (clientProperties != null)
+ {
+ clientProperties.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentBody.java Thu Aug 20 11:23:38 2015
@@ -36,19 +36,15 @@ public class ContentBody implements AMQB
private QpidByteBuffer _payload;
- public ContentBody()
- {
- }
-
public ContentBody(ByteBuffer payload)
{
- _payload = QpidByteBuffer.wrap(payload);
+ _payload = QpidByteBuffer.wrap(payload.duplicate());
}
public ContentBody(QpidByteBuffer payload)
{
- _payload = payload;
+ _payload = payload.duplicate();
}
@@ -65,7 +61,7 @@ public class ContentBody implements AMQB
public void writePayload(DataOutput buffer) throws IOException
{
byte[] data = new byte[_payload.remaining()];
- _payload.duplicate().get(data);
+ _payload.copyTo(data);
buffer.write(data);
}
@@ -80,7 +76,9 @@ public class ContentBody implements AMQB
{
if(_payload != null)
{
- sender.send(_payload.duplicate());
+ final QpidByteBuffer duplicate = _payload.duplicate();
+ sender.send(duplicate);
+ duplicate.dispose();
return _payload.remaining();
}
else
@@ -94,6 +92,15 @@ public class ContentBody implements AMQB
return _payload;
}
+ public void dispose()
+ {
+ if (_payload != null)
+ {
+ _payload.dispose();
+ _payload = null;
+ }
+ }
+
public static void process(final MarkableDataInput in,
final ChannelMethodProcessor methodProcessor, final long bodySize)
throws IOException
@@ -105,6 +112,8 @@ public class ContentBody implements AMQB
{
methodProcessor.receiveMessageContent(payload);
}
+
+ payload.dispose();
}
public static AMQFrame createAMQFrame(int channelId, ContentBody body)
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java Thu Aug 20 11:23:38 2015
@@ -198,4 +198,10 @@ public class ContentHeaderBody implement
methodProcessor.receiveMessageHeader(properties, bodySize);
}
}
+
+ public void dispose()
+ {
+ _properties.dispose();
+ _properties = null;
+ }
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java Thu Aug 20 11:23:38 2015
@@ -619,16 +619,16 @@ public class EncodingUtils
return result;
}
- public static FieldTable readFieldTable(MarkableDataInput buffer) throws AMQFrameDecodingException, IOException
+ public static FieldTable readFieldTable(MarkableDataInput input) throws AMQFrameDecodingException, IOException
{
- long length = ((long)(buffer.readInt())) & 0xFFFFFFFFL;
+ long length = ((long)(input.readInt())) & 0xFFFFFFFFL;
if (length == 0)
{
return null;
}
else
{
- return new FieldTable(buffer.readAsByteBuffer((int) length));
+ return new FieldTable(input, (int) length);
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ExchangeDeclareBody.java Thu Aug 20 11:23:38 2015
@@ -229,5 +229,9 @@ public class ExchangeDeclareBody extends
nowait,
arguments);
}
+ if (arguments != null)
+ {
+ arguments.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/FieldTable.java Thu Aug 20 11:23:38 2015
@@ -81,11 +81,17 @@ public class FieldTable
}
}
+ public FieldTable(MarkableDataInput input, int len) throws IOException
+ {
+ this();
+ _encodedForm = input.readAsByteBuffer(len);
+ _encodedSize = len;
+ }
public FieldTable(QpidByteBuffer buffer)
{
this();
- _encodedForm = buffer;
+ _encodedForm = buffer.duplicate();
_encodedSize = buffer.remaining();
}
@@ -857,7 +863,7 @@ public class FieldTable
else
{
byte[] encodedCopy = new byte[_encodedForm.remaining()];
- _encodedForm.duplicate().get(encodedCopy);
+ _encodedForm.copyTo(encodedCopy);
return encodedCopy;
}
@@ -932,6 +938,15 @@ public class FieldTable
return map;
}
+ public void dispose()
+ {
+ if(_encodedForm != null)
+ {
+ _encodedForm.dispose();
+ _encodedForm = null;
+ }
+ }
+
public static interface FieldTableElementProcessor
{
@@ -1055,11 +1070,35 @@ public class FieldTable
public void clear()
{
initMapIfNecessary();
- _encodedForm = null;
+ if (_encodedForm != null)
+ {
+ _encodedForm.dispose();
+ _encodedForm = null;
+ }
_properties.clear();
_encodedSize = 0;
}
+ public void clearEncodedForm()
+ {
+ synchronized (this)
+ {
+ if (_properties == null)
+ {
+ if (_encodedForm != null)
+ {
+ populateFromBuffer();
+ }
+ }
+
+ if (_encodedForm != null)
+ {
+ _encodedForm.dispose();
+ _encodedForm = null;
+ }
+ }
+ }
+
public Set<AMQShortString> keySet()
{
initMapIfNecessary();
@@ -1072,7 +1111,7 @@ public class FieldTable
if (_encodedForm != null)
{
byte[] encodedCopy = new byte[_encodedForm.remaining()];
- _encodedForm.duplicate().get(encodedCopy);
+ _encodedForm.copyTo(encodedCopy);
buffer.write(encodedCopy);
}
@@ -1103,7 +1142,8 @@ public class FieldTable
private void setFromBuffer() throws AMQFrameDecodingException, IOException
{
- MarkableDataInput dataInput = _encodedForm.slice().asDataInput();
+ final QpidByteBuffer slice = _encodedForm.slice();
+ MarkableDataInput dataInput = slice.asDataInput();
if (_encodedSize > 0)
{
@@ -1122,7 +1162,7 @@ public class FieldTable
while (dataInput.available() > 0);
}
-
+ slice.dispose();
}
public int hashCode()
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueBindBody.java Thu Aug 20 11:23:38 2015
@@ -179,5 +179,9 @@ public class QueueBindBody extends AMQMe
{
dispatcher.receiveQueueBind(queue, exchange, bindingKey, nowait, arguments);
}
+ if (arguments != null)
+ {
+ arguments.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueDeclareBody.java Thu Aug 20 11:23:38 2015
@@ -209,5 +209,9 @@ public class QueueDeclareBody extends AM
{
dispatcher.receiveQueueDeclare(queue, passive, durable, exclusive, autoDelete, nowait, arguments);
}
+ if (arguments != null)
+ {
+ arguments.clearEncodedForm();
+ }
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/QueueUnbindBody.java Thu Aug 20 11:23:38 2015
@@ -160,5 +160,10 @@ public class QueueUnbindBody extends AMQ
{
dispatcher.receiveQueueUnbind(queue, exchange, routingKey, arguments);
}
+ if (arguments != null)
+ {
+ arguments.clearEncodedForm();
+ }
+
}
}
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java?rev=1696761&r1=1696760&r2=1696761&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/transport/ByteBufferSender.java Thu Aug 20 11:23:38 2015
@@ -20,8 +20,6 @@
*/
package org.apache.qpid.transport;
-import java.nio.ByteBuffer;
-
import org.apache.qpid.bytebuffer.QpidByteBuffer;
public interface ByteBufferSender
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org