Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict.

This commit is contained in:
Simone Bordet 2014-10-13 17:10:03 +02:00
parent e7d830c26e
commit fb590a5fff
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
View File

@ -18,11 +18,6 @@
package org.eclipse.jetty.http; package org.eclipse.jetty.http;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
@ -35,6 +30,11 @@ import org.junit.Assert;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
/** /**
* *
*/ */
@ -1585,7 +1585,7 @@ public class HttpParserTest
"Accept: unknown\r\n" + "Accept: unknown\r\n" +
"\r\n"); "\r\n");
HttpParser.RequestHandler<ByteBuffer> handler = new Handler(); HttpParser.RequestHandler handler = new Handler();
HttpParser parser= new HttpParser(handler); HttpParser parser= new HttpParser(handler);
parser.parseNext(buffer); parser.parseNext(buffer);