Author: norman
Date: Mon May 31 14:20:23 2010
New Revision: 949752
URL: http://svn.apache.org/viewvc?rev=949752&view=rev
Log:
Upgrade to protocols-1.1-SNAPSHOT and make sure we don't get an exception when
call popLineHandler if none was pushed before.. (JAMES-1011)
Modified:
james/server/trunk/pom.xml
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=949752&r1=949751&r2=949752&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Mon May 31 14:20:23 2010
@@ -328,7 +328,7 @@
<dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-api</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -367,12 +367,12 @@
<dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-smtp</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
<artifactId>protocols-smtp</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java?rev=949752&r1=949751&r2=949752&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java
Mon May 31 14:20:23 2010
@@ -119,9 +119,11 @@ public class SMTPNettySession extends Ab
* @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler()
*/
public void popLineHandler() {
- getChannelHandlerContext().getPipeline()
- .remove("lineHandler" + lineHandlerCount);
- lineHandlerCount--;
+ if (lineHandlerCount > 0) {
+ getChannelHandlerContext().getPipeline()
+ .remove("lineHandler" + lineHandlerCount);
+ lineHandlerCount--;
+ }
}
/**
@@ -129,7 +131,8 @@ public class SMTPNettySession extends Ab
*/
public void pushLineHandler(LineHandler<SMTPSession>
overrideCommandHandler) {
lineHandlerCount++;
- getChannelHandlerContext().getPipeline().addBefore("coreHandler",
+
+ getChannelHandlerContext().getPipeline().addAfter("timeoutHandler",
"lineHandler" + lineHandlerCount,
new
LineHandlerUpstreamHandler<SMTPSession>(overrideCommandHandler));
}
@@ -212,5 +215,9 @@ public class SMTPNettySession extends Ab
public boolean useHeloEhloEnforcement() {
return theConfigData.useHeloEhloEnforcement();
}
+
+ public int getPushedLineHandlerCount() {
+ return lineHandlerCount;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
