svn commit: r1087196 - in /james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty: ChannelImapResponseWriter.java ChannelWritableByteChannel.java

[norman]

Author: norman
Date: Thu Mar 31 05:58:20 2011
New Revision: 1087196

URL: http://svn.apache.org/viewvc?rev=1087196&view=rev
Log:
Fix possible deadlock which I committed by mistake

Modified:
    
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
    
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelWritableByteChannel.java

Modified: 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java?rev=1087196&r1=1087195&r2=1087196&view=diff
==============================================================================
--- 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
 (original)
+++ 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelImapResponseWriter.java
 Thu Mar 31 05:58:20 2011
@@ -27,7 +27,6 @@ import org.apache.james.imap.main.Abstra
 import org.apache.james.imap.message.response.Literal;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
 
 /**
  * {@link AbstractImapResponseWriter} implementation which writes the data to 
a {@link Channel}
@@ -48,11 +47,7 @@ public class ChannelImapResponseWriter e
      * @see 
org.apache.james.imap.main.AbstractImapResponseWriter#write(java.nio.ByteBuffer)
      */
     protected void write(ByteBuffer buffer) throws IOException {
-        ChannelFuture f = 
channel.write(ChannelBuffers.wrappedBuffer(buffer)).awaitUninterruptibly();
-        Throwable t = f.getCause();
-        if (t != null) {
-            throw new IOException(t.getMessage());
-        }
+        channel.write(ChannelBuffers.wrappedBuffer(buffer));
     }
 
     /*

Modified: 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelWritableByteChannel.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelWritableByteChannel.java?rev=1087196&r1=1087195&r2=1087196&view=diff
==============================================================================
--- 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelWritableByteChannel.java
 (original)
+++ 
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/ChannelWritableByteChannel.java
 Thu Mar 31 05:58:20 2011
@@ -24,7 +24,6 @@ import java.nio.channels.WritableByteCha
 
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
 
 /**
  * Some adapter class which allows to write to {@link Channel} via a {@link 
WritableByteChannel} interface
@@ -56,11 +55,8 @@ public class ChannelWritableByteChannel 
         byte data[] = new byte[src.remaining()];
         src.get(data);
         
-        ChannelFuture future = 
channel.write(ChannelBuffers.wrappedBuffer(data)).awaitUninterruptibly();
-        Throwable t = future.getCause();
-        if (t != null) {
-            throw new IOException(t.getMessage());
-        }
+        channel.write(ChannelBuffers.wrappedBuffer(data));
+      
         return data.length;
     }
    



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