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

[#735] Make sure the handshake ChannelFuture is notified after the right encoder is present in the ChannelPipeline

Browse Source
This commit is contained in:
Norman Maurer 2012-11-13 09:14:16 +01:00
parent df575c6cd0
commit a0e9921517
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/jboss/netty/channel/ChannelFutureNotifier.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright 2012 The Netty Project
*
* The Netty Project licenses this file to you under the Apache License,
* version 2.0 (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*/
package org.jboss.netty.channel;
/**
* ChannelFutureListener implementation which takes another ChannelFuture and notifies it
* once the operationComplete method was called.
*/
public final class ChannelFutureNotifier implements ChannelFutureListener {
private final ChannelFuture future;
public ChannelFutureNotifier(ChannelFuture future) {
this.future = future;
}
public void operationComplete(ChannelFuture cf) throws Exception {
if (cf.isSuccess()) {
future.setSuccess();
} else {
future.setFailure(cf.getCause());
}
}
}

6
src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
View File

@ -20,7 +20,9 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.channel.ChannelFutureNotifier;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.DefaultChannelFuture;
import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
@ -177,6 +179,7 @@ public class WebSocketClientHandshaker08 extends WebSocketClientHandshaker {
}
}
final ChannelFuture handshakeFuture = new DefaultChannelFuture(channel, false);
ChannelFuture future = channel.write(request);
future.addListener(new ChannelFutureListener() {
@ -185,8 +188,9 @@ public class WebSocketClientHandshaker08 extends WebSocketClientHandshaker {
p.replace(HttpRequestEncoder.class, "ws-encoder", new WebSocket08FrameEncoder(true));
}
});
future.addListener(new ChannelFutureNotifier(handshakeFuture));
return future;
return handshakeFuture;
}
/**

6
src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
View File

@ -20,7 +20,9 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.channel.ChannelFutureNotifier;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.DefaultChannelFuture;
import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
@ -174,6 +176,7 @@ public class WebSocketClientHandshaker13 extends WebSocketClientHandshaker {
}
ChannelFuture future = channel.write(request);
final ChannelFuture handshakeFuture = new DefaultChannelFuture(channel, false);
future.addListener(new ChannelFutureListener() {
public void operationComplete(ChannelFuture future) {
@ -181,8 +184,9 @@ public class WebSocketClientHandshaker13 extends WebSocketClientHandshaker {
p.replace(HttpRequestEncoder.class, "ws-encoder", new WebSocket13FrameEncoder(true));
}
});
future.addListener(new ChannelFutureNotifier(handshakeFuture));
return future;
return handshakeFuture;
}
/**