Author: rhs
Date: Tue Jun 10 11:29:30 2008
New Revision: 666259
URL: http://svn.apache.org/viewvc?rev=666259&view=rev
Log:
QPID-1129: unless otherwise specified, limit the receive buffer size to 64K
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java?rev=666259&r1=666258&r2=666259&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
(original)
+++
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/mina/MinaHandler.java
Tue Jun 10 11:29:30 2008
@@ -61,6 +61,7 @@
private static final String DEFAULT_READ_BUFFER_LIMIT = "262144";
/** Default buffer size for pending messages writes */
private static final String DEFAULT_WRITE_BUFFER_LIMIT = "262144";
+ private static final int MAX_RCVBUF = 64*1024;
private static final Logger log = Logger.get(MinaHandler.class);
@@ -226,7 +227,11 @@
if (receiveBufferSize != null && receiveBufferSize > 0)
{
scfg.setReceiveBufferSize(receiveBufferSize);
- }
+ }
+ else if (scfg.getReceiveBufferSize() > MAX_RCVBUF)
+ {
+ scfg.setReceiveBufferSize(MAX_RCVBUF);
+ }
connector.setWorkerTimeout(0);
ConnectFuture cf = connector.connect(address, handler);
cf.join();