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

ensure getRawQuery is not null before appending

Browse Source 
Motivation:

without this check then given a URI with path /path the resulting URL will be /path?null=

Modifications:

check that getRawQuery doesn't return null and only append if not

Result:

urls of the form /path will not have a null?= appended
This commit is contained in:
zcourts 2014-12-15 17:23:45 +00:00 committed by Norman Maurer
parent 8d4a97e05b
commit bd6d0f3fd5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
View File

@ -159,7 +159,7 @@ public class QueryStringDecoder {
hasPath = false;
}
// Also take care of cut of things like "http://localhost"
this.uri = rawPath + '?' + uri.getRawQuery();
this.uri = rawPath + (uri.getRawQuery() == null? "" : '?' + uri.getRawQuery());
this.charset = charset;
this.maxParams = maxParams;

7
codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java
View File

@ -20,6 +20,7 @@ import org.junit.Assert;
import org.junit.Test;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -27,6 +28,12 @@ import java.util.Map.Entry;
public class QueryStringDecoderTest {
@Test
public void testBasicUris() throws URISyntaxException {
QueryStringDecoder d = new QueryStringDecoder(new URI("http://localhost/path"));
Assert.assertEquals(0, d.parameters().size());
}
@Test
public void testBasic() throws Exception {
QueryStringDecoder d;