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

Fix broken UDP support. This got broken in 3.4.0.Alpha1

Browse Source
This commit is contained in:
Norman Maurer 2012-04-02 19:50:31 +02:00
parent 0334267b51
commit f1f92c0290
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/jboss/netty/channel/socket/nio/AbstractNioWorker.java
View File

@ -431,9 +431,8 @@ abstract class AbstractNioWorker implements Worker {
}
protected abstract boolean scheduleWriteIfNecessary(final AbstractNioChannel<?> channel);
private void write0(AbstractNioChannel<?> channel) {
protected void write0(AbstractNioChannel<?> channel) {
boolean open = true;
boolean addOpWrite = false;
boolean removeOpWrite = false;
@ -638,7 +637,7 @@ abstract class AbstractNioWorker implements Worker {
}
}
private void cleanUpWriteBuffer(AbstractNioChannel<?> channel) {
protected void cleanUpWriteBuffer(AbstractNioChannel<?> channel) {
Exception cause = null;
boolean fireExceptionCaught = false;

29
src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
View File

@ -206,5 +206,34 @@ public class NioDatagramWorker extends AbstractNioWorker {
}
}
}
@Override
public void writeFromUserCode(final AbstractNioChannel<?> channel) {
/*
* Note that we are not checking if the channel is connected. Connected
* has a different meaning in UDP and means that the channels socket is
* configured to only send and receive from a given remote peer.
*/
if (!channel.isBound()) {
cleanUpWriteBuffer(channel);
return;
}
if (scheduleWriteIfNecessary(channel)) {
return;
}
// From here, we are sure Thread.currentThread() == workerThread.
if (channel.writeSuspended) {
return;
}
if (channel.inWriteNowLoop) {
return;
}
write0(channel);
}
}