commit 37200ddb39a2b039d8c75056d2f7d4b49ca77f00
author Karthik Kambatla <kkambatl@cs.purdue.edu> Wed Mar 14 18:08:52 2012 -0400
committer Matthieu Morel <mmorel@apache.org> Mon Mar 26 15:52:29 2012 +0200
tree 828df538c66fafd7aef23f016b15105a317fd2e1
parent 265b9cdaddf00c52b537a27000de26cf4252cc98

S4-7: Minor changes to avoid blocking on channel close

subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPEmitter.java

diff --git a/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPEmitter.java b/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPEmitter.java
index 6dcde60..171315a 100644
--- a/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPEmitter.java
+++ b/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPEmitter.java
@@ -233,7 +233,6 @@
                     return false;
                 }
                 bufferSize++;
-                // logger.debug("buffer size = " + bufferSize);
             }
 
             pending.add(m);

subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPListener.java

diff --git a/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPListener.java b/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPListener.java
index 98e7aa1..af019c0 100644
--- a/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPListener.java
+++ b/subprojects/s4-comm/src/main/java/org/apache/s4/comm/tcp/TCPListener.java
@@ -12,6 +12,8 @@
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -111,15 +113,15 @@
         public void exceptionCaught(ChannelHandlerContext context, ExceptionEvent event) {
             logger.error("Error", event.getCause());
             Channel c = context.getChannel();
-            if (c.isOpen()) {
-                logger.error("Closing channel due to exception");
-                try {
-                    if (c.close().await().isSuccess())
-                        channels.remove(c);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
+            c.close().addListener(new ChannelFutureListener() {
+                @Override
+                public void operationComplete(ChannelFuture future) throws Exception {
+                    if (future.isSuccess())
+                        channels.remove(future.getChannel());
+                    else
+                        logger.error("FAILED to close channel");
                 }
-            }
+            });
         }
     }
 }