Author: norman
Date: Thu Jun 23 11:12:49 2011
New Revision: 1138833
URL: http://svn.apache.org/viewvc?rev=1138833&view=rev
Log:
Fix connection limit. See JAMES-1281
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1138833&r1=1138832&r2=1138833&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Thu Jun 23 11:12:49 2011
@@ -575,7 +575,7 @@ public abstract class AbstractConfigurab
@Override
protected ChannelPipelineFactory createPipelineFactory(ChannelGroup group)
{
- return new AbstractExecutorAwareChannelPipelineFactory(connPerIP,
connPerIP, connPerIP, group, enabledCipherSuites) {
+ return new AbstractExecutorAwareChannelPipelineFactory(getTimeout(),
connectionLimit, connPerIP, group, enabledCipherSuites) {
@Override
protected SSLContext getSSLContext() {
return AbstractConfigurableAsyncServer.this.getSSLContext();
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java?rev=1138833&r1=1138832&r2=1138833&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/OioSMTPServerTest.java
Thu Jun 23 11:12:49 2011
@@ -27,12 +27,4 @@ public class OioSMTPServerTest extends S
protected SMTPServer createSMTPServer() {
return new OioSMTPServer();
}
-
- /**
- * TODO: This should not be needed
- */
- public void testConnectionLimit() throws Exception {
- // TODO: Check why the connection limit is not working with IO
- // implementation
- }
}
Modified:
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java?rev=1138833&r1=1138832&r2=1138833&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
(original)
+++
james/server/trunk/smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
Thu Jun 23 11:12:49 2011
@@ -212,7 +212,7 @@ public class SMTPServerTest extends Test
smtpProtocol.disconnect();
}
- /*
+
public void testConnectionLimit() throws Exception {
m_testConfiguration.setConnectionLimit(2);
finishSetUp(m_testConfiguration);
@@ -241,7 +241,7 @@ public class SMTPServerTest extends Test
Thread.sleep(3000);
}
- */
+
protected void finishSetUp(SMTPTestConfiguration testConfiguration) throws
Exception {
testConfiguration.init();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
