andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix compilation errors

Browse Source
This commit is contained in:
Trustin Lee 2012-05-30 02:01:48 -07:00
parent 78974e85c5
commit 392623749e
5 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
transport/src/main/java/io/netty/channel/socket/oio/AbstractOioMessageChannel.java
View File

@ -10,15 +10,13 @@ import java.util.Queue;
abstract class AbstractOioMessageChannel extends AbstractOioChannel { abstract class AbstractOioMessageChannel extends AbstractOioChannel {
private final ChannelBufferHolder<Object> firstOut = ChannelBufferHolders.messageBuffer();
protected AbstractOioMessageChannel(Channel parent, Integer id) { protected AbstractOioMessageChannel(Channel parent, Integer id) {
super(parent, id); super(parent, id);
} }
@Override @Override
protected ChannelBufferHolder<Object> firstOut() { protected ChannelBufferHolder<?> newOutboundBuffer() {
return firstOut; return ChannelBufferHolders.messageBuffer();
} }
@Override @Override

7
transport/src/main/java/io/netty/channel/socket/oio/AbstractOioStreamChannel.java
View File

@ -10,16 +10,13 @@ import java.io.IOException;
abstract class AbstractOioStreamChannel extends AbstractOioChannel { abstract class AbstractOioStreamChannel extends AbstractOioChannel {
private final ChannelBufferHolder<?> firstOut = ChannelBufferHolders.byteBuffer();
protected AbstractOioStreamChannel(Channel parent, Integer id) { protected AbstractOioStreamChannel(Channel parent, Integer id) {
super(parent, id); super(parent, id);
} }
@Override @Override
@SuppressWarnings("unchecked") protected ChannelBufferHolder<?> newOutboundBuffer() {
protected ChannelBufferHolder<Object> firstOut() { return ChannelBufferHolders.byteBuffer();
return (ChannelBufferHolder<Object>) firstOut;
} }
@Override @Override

5
transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
View File

@ -47,7 +47,6 @@ public class OioDatagramChannel extends AbstractOioMessageChannel
private final MulticastSocket socket; private final MulticastSocket socket;
private final DatagramChannelConfig config; private final DatagramChannelConfig config;
private final ChannelBufferHolder<Object> out = ChannelBufferHolders.messageBuffer();
private final java.net.DatagramPacket tmpPacket = new java.net.DatagramPacket(EMPTY_DATA, 0); private final java.net.DatagramPacket tmpPacket = new java.net.DatagramPacket(EMPTY_DATA, 0);
private static MulticastSocket newSocket() { private static MulticastSocket newSocket() {
@ -103,8 +102,8 @@ public class OioDatagramChannel extends AbstractOioMessageChannel
} }
@Override @Override
protected ChannelBufferHolder<Object> firstOut() { protected ChannelBufferHolder<?> newOutboundBuffer() {
return out; return ChannelBufferHolders.messageBuffer();
} }
@Override @Override

2
transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
View File

@ -161,7 +161,7 @@ public class OioServerSocketChannel extends AbstractOioMessageChannel
} }
@Override @Override
protected ChannelBufferHolder<Object> firstOut() { protected ChannelBufferHolder<?> newOutboundBuffer() {
return ChannelBufferHolders.discardBuffer(); return ChannelBufferHolders.discardBuffer();
} }

6
transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
View File

@ -42,7 +42,6 @@ public class OioSocketChannel extends AbstractOioStreamChannel
private final Socket socket; private final Socket socket;
private final SocketChannelConfig config; private final SocketChannelConfig config;
private final ChannelBufferHolder<?> out = ChannelBufferHolders.byteBuffer();
private InputStream is; private InputStream is;
private OutputStream os; private OutputStream os;
@ -96,9 +95,8 @@ public class OioSocketChannel extends AbstractOioStreamChannel
} }
@Override @Override
@SuppressWarnings("unchecked") protected ChannelBufferHolder<?> newOutboundBuffer() {
protected ChannelBufferHolder<Object> firstOut() { return ChannelBufferHolders.byteBuffer();
return (ChannelBufferHolder<Object>) out;
} }
@Override @Override