You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/04/24 21:33:07 UTC

svn commit: r937683 - in /james/server/trunk: netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelUpstreamHandler.java smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java

Author: norman
Date: Sat Apr 24 19:33:06 2010
New Revision: 937683

URL: http://svn.apache.org/viewvc?rev=937683&view=rev
Log:
SMTPServer was not calling the right super method on channel close. Which could cause memory to leak

Modified:
    james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelUpstreamHandler.java
    james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java

Modified: james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelUpstreamHandler.java?rev=937683&r1=937682&r2=937683&view=diff
==============================================================================
--- james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelUpstreamHandler.java (original)
+++ james/server/trunk/netty-socket/src/main/java/org/apache/james/socket/netty/AbstractChannelUpstreamHandler.java Sat Apr 24 19:33:06 2010
@@ -116,8 +116,9 @@ public abstract class AbstractChannelUps
         if (session != null) {
             session.resetState();
             session = null;
-            attributes.remove(channel);
         }
+        attributes.remove(channel);
+
     }
 
     /**

Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java?rev=937683&r1=937682&r2=937683&view=diff
==============================================================================
--- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java (original)
+++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java Sat Apr 24 19:33:06 2010
@@ -72,7 +72,7 @@ public class SMTPChannelUpstreamHandler 
     public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
         logger.info("Dispose objects while closing channel " + ctx.getChannel().getId());
         cleanup(ctx.getChannel());
-        super.channelDisconnected(ctx, e);
+        super.channelClosed(ctx, e);
     }
 
     



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org