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

Fix example for Http Upload

Browse Source 
Motivation:
The example mis handle two elements:
1) Last message is a LastHttpContent and is not taken into account by
the server handler
2) The client makes a sync on last write (chunked) but there is no flush
before, therefore the sync is waiting forever.

Modifications:
1) Take into account the message LastHttpContent in simple Get.
2) Removes sync but add flush for each post and multipost parts

Results:
Example is no more blocked after get test.

Should be done also in 4.0 and Master (similar changes)
This commit is contained in:
fredericBregier 2014-08-17 20:37:33 +02:00 committed by Norman Maurer
parent d150ee7886
commit 26116541ed
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java
View File

@ -239,8 +239,9 @@ public final class HttpUploadClient {
// test if request was chunked and if so, finish the write // test if request was chunked and if so, finish the write
if (bodyRequestEncoder.isChunked()) { // could do either request.isChunked() if (bodyRequestEncoder.isChunked()) { // could do either request.isChunked()
// either do it through ChunkedWriteHandler // either do it through ChunkedWriteHandler
channel.write(bodyRequestEncoder).sync(); channel.write(bodyRequestEncoder);
} }
channel.flush();
// Do not clear here since we will reuse the InterfaceHttpData on the next request // Do not clear here since we will reuse the InterfaceHttpData on the next request
// for the example (limit action on client side). Take this as a broadcast of the same // for the example (limit action on client side). Take this as a broadcast of the same
@ -289,8 +290,9 @@ public final class HttpUploadClient {
// test if request was chunked and if so, finish the write // test if request was chunked and if so, finish the write
if (bodyRequestEncoder.isChunked()) { if (bodyRequestEncoder.isChunked()) {
channel.write(bodyRequestEncoder).sync(); channel.write(bodyRequestEncoder);
} }
channel.flush();
// Now no more use of file representation (and list of HttpData) // Now no more use of file representation (and list of HttpData)
bodyRequestEncoder.cleanFiles(); bodyRequestEncoder.cleanFiles();

4
example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java
View File

@ -145,7 +145,7 @@ public class HttpUploadServerHandler extends SimpleChannelInboundHandler<HttpObj
// GET Method: should not try to create a HttpPostRequestDecoder // GET Method: should not try to create a HttpPostRequestDecoder
// So stop here // So stop here
responseContent.append("\r\n\r\nEND OF GET CONTENT\r\n"); responseContent.append("\r\n\r\nEND OF GET CONTENT\r\n");
writeResponse(ctx.channel()); // Not now: LastHttpContent will be sent writeResponse(ctx.channel());
return; return;
} }
try { try {
@ -195,6 +195,8 @@ public class HttpUploadServerHandler extends SimpleChannelInboundHandler<HttpObj
reset(); reset();
} }
} }
} else {
writeResponse(ctx.channel());
} }
} }