Author: matthieu
Date: Tue Nov 17 11:40:55 2015
New Revision: 1714763
URL: http://svn.apache.org/viewvc?rev=1714763&view=rev
Log:
fixup! PROTOCOLS-114 Upgrading netty should fix the lock in SMTP and POP3
testsuite
Modified:
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
Modified:
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java?rev=1714763&r1=1714762&r2=1714763&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
(original)
+++
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
Tue Nov 17 11:40:55 2015
@@ -28,7 +28,6 @@ import org.jboss.netty.handler.codec.fra
public class SwitchableDelimiterBasedFrameDecoder extends
DelimiterBasedFrameDecoder {
private volatile boolean framingEnabled = true;
- private volatile ChannelBuffer cumulation;
public SwitchableDelimiterBasedFrameDecoder(final int maxFrameLength,
final boolean stripDelimiter, final ChannelBuffer... delimiters) {
super(maxFrameLength, stripDelimiter, delimiters);
@@ -55,13 +54,5 @@ public class SwitchableDelimiterBasedFra
Channels.fireMessageReceived(ctx, spareBytes);
}
}
-
-
-
- @Override
- protected synchronized ChannelBuffer
newCumulationBuffer(ChannelHandlerContext ctx, int minimumCapacity) {
- this.cumulation = super.newCumulationBuffer(ctx, minimumCapacity);
- return this.cumulation;
- }
}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
