Author: rgodfrey
Date: Thu Aug 27 23:07:42 2015
New Revision: 1698241
URL: http://svn.apache.org/r1698241
Log:
QPID-6662 : Address comments from [~kwall]
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/bytebuffer/QpidByteBuffer.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=1698241&r1=1698240&r2=1698241&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 27 23:07:42 2015
@@ -1041,7 +1041,7 @@ public abstract class AbstractBDBMessage
private final long _messageId;
- private volatile MessageDataRef<T> _messageDataRef;
+ private MessageDataRef<T> _messageDataRef;
StoredBDBMessage(long messageId, T metaData)
{
@@ -1258,7 +1258,7 @@ public abstract class AbstractBDBMessage
}
@Override
- public boolean isInMemory()
+ public synchronized boolean isInMemory()
{
return _messageDataRef.isHardRef() || _messageDataRef.getData() !=
null;
}
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=1698241&r1=1698240&r2=1698241&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 27 23:07:42 2015
@@ -499,7 +499,7 @@ public final class QpidByteBuffer
public static Collection<QpidByteBuffer>
allocateDirectCollectionFromPool(int size)
{
final int maxPooledBufferSize = _maxPooledBufferSize.get();
- if(size <= maxPooledBufferSize || maxPooledBufferSize == 0)
+ if(maxPooledBufferSize == 0)
{
return Collections.singleton(allocateDirectFromPool(size));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
