From abc2877f91e2bb1afb3c2f38d006004abebe1067 Mon Sep 17 00:00:00 2001 From: norman Date: Thu, 3 May 2012 09:16:45 +0200 Subject: [PATCH] Fix compile errors. See #299 --- .../netty/handler/codec/http/AbstractDiskHttpData.java | 2 +- .../netty/handler/codec/http/HttpPostRequestDecoder.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java index 2a851139d0..d6af720de6 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java @@ -194,7 +194,7 @@ public abstract class AbstractDiskHttpData extends AbstractHttpData { read = inputStream.read(bytes); } localfileChannel.force(false); - localfileChannel.close()); + localfileChannel.close(); size = written; if (definedSize > 0 && definedSize < size) { file.delete(); diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java index 912e4d18d5..58f40efac9 100644 --- a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java +++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java @@ -26,8 +26,8 @@ import java.util.TreeMap; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; -import org.jboss.netty.handler.codec.http2.HttpPostBodyUtil.SeekAheadNoBackArrayException; -import org.jboss.netty.handler.codec.http2.HttpPostBodyUtil.SeekAheadOptimize; +import org.jboss.netty.handler.codec.http.HttpPostBodyUtil.SeekAheadNoBackArrayException; +import org.jboss.netty.handler.codec.http.HttpPostBodyUtil.SeekAheadOptimize; import org.jboss.netty.handler.codec.http.HttpPostBodyUtil.TransferEncodingMechanism; /** @@ -882,7 +882,7 @@ public class HttpPostRequestDecoder { throws ErrorDataDecoderException { // --AaB03x or --AaB03x-- int readerIndex = undecodedChunk.readerIndex(); - skipControlCharacters(undecodedChunk); + skipControlCharacters(); skipOneLine(); String newline; try { @@ -923,7 +923,7 @@ public class HttpPostRequestDecoder { } // read many lines until empty line with newline found! Store all data while (!skipOneLine()) { - skipControlCharacters(undecodedChunk); + skipControlCharacters(); String newline; try { newline = readLine();