Author: matthieu
Date: Tue Nov 17 11:40:37 2015
New Revision: 1714760
URL: http://svn.apache.org/viewvc?rev=1714760&view=rev
Log:
PROTOCOLS-114 Upgrading netty should fix the lock in SMTP and POP3 testsuite
Modified:
james/project/trunk/protocols/pom.xml
james/project/trunk/server/pom.xml
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/SwitchableDelimiterBasedFrameDecoder.java
Modified: james/project/trunk/protocols/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/protocols/pom.xml?rev=1714760&r1=1714759&r2=1714760&view=diff
==============================================================================
--- james/project/trunk/protocols/pom.xml (original)
+++ james/project/trunk/protocols/pom.xml Tue Nov 17 11:40:37 2015
@@ -47,7 +47,7 @@
<properties>
<target.jdk>1.6</target.jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <netty.version>3.3.1.Final</netty.version>
+ <netty.version>3.10.5.Final</netty.version>
<apache-mime4j.version>0.8.0-SNAPSHOT</apache-mime4j.version>
<mailbox.version>0.6-SNAPSHOT</mailbox.version>
<commons-net.version>3.2</commons-net.version>
Modified: james/project/trunk/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/pom.xml?rev=1714760&r1=1714759&r2=1714760&view=diff
==============================================================================
--- james/project/trunk/server/pom.xml (original)
+++ james/project/trunk/server/pom.xml Tue Nov 17 11:40:37 2015
@@ -163,7 +163,7 @@
<jcr.version>2.0</jcr.version>
<tika-parsers.version>1.2</tika-parsers.version>
<xbean-spring.version>3.12</xbean-spring.version>
- <netty.version>3.3.1.Final</netty.version>
+ <netty.version>3.10.5.Final</netty.version>
<geronimo-annotation-spec.version>1.0.1</geronimo-annotation-spec.version>
<spring-osgi-extender.version>1.2.1</spring-osgi-extender.version>
<org.osgi.core.version>5.0.0</org.osgi.core.version>
Modified:
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
URL:
http://svn.apache.org/viewvc/james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java?rev=1714760&r1=1714759&r2=1714760&view=diff
==============================================================================
---
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
(original)
+++
james/project/trunk/server/protocols/protocols-imap4/src/main/java/org/apache/james/imapserver/netty/ImapRequestFrameDecoder.java
Tue Nov 17 11:40:37 2015
@@ -216,9 +216,9 @@ public class ImapRequestFrameDecoder ext
}
}
- @SuppressWarnings("unchecked")
@Override
- protected ChannelBuffer
createCumulationDynamicBuffer(ChannelHandlerContext ctx) {
+ protected synchronized ChannelBuffer
newCumulationBuffer(ChannelHandlerContext ctx, int minimumCapacity) {
+ @SuppressWarnings("unchecked")
Map<String, Object> attachment = (Map<String, Object>)
ctx.getAttachment();
int size = (Integer) attachment.get(NEEDED_DATA);
@@ -229,7 +229,7 @@ public class ImapRequestFrameDecoder ext
if (size > 0) {
return ChannelBuffers.dynamicBuffer(size,
ctx.getChannel().getConfig().getBufferFactory());
}
- return super.createCumulationDynamicBuffer(ctx);
+ return super.newCumulationBuffer(ctx, minimumCapacity);
}
}
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=1714760&r1=1714759&r2=1714760&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:37 2015
@@ -56,9 +56,12 @@ public class SwitchableDelimiterBasedFra
}
}
+
+
@Override
- protected synchronized ChannelBuffer
createCumulationDynamicBuffer(final ChannelHandlerContext ctx) {
- this.cumulation = super.createCumulationDynamicBuffer(ctx);
- return this.cumulation;
+ 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
