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

Merge branch 'jetty-9.4.x-4860-NullHttpFields' of github.com:eclipse/jetty.project into jetty-9.4.x-4860-NullHttpFields

This commit is contained in:
Joakim Erdfelt 2020-05-11 17:26:05 -05:00
parent 4dc024b2b1 59a66158ed
commit d127db5186
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
View File

@ -636,7 +636,8 @@ public class HttpFields implements Iterable<HttpField>
{
if (put)
{
System.arraycopy(_fields, i + 1, _fields, i, --_size - i);
_size--;
System.arraycopy(_fields, i + 1, _fields, i, _size - i);
}
else
{
@ -676,7 +677,7 @@ public class HttpFields implements Iterable<HttpField>
*/
public void put(HttpHeader header, String value)
{
Objects.requireNonNull(header, "header");
Objects.requireNonNull(header, "header must not be null");
if (value == null)
remove(header);
@ -692,7 +693,7 @@ public class HttpFields implements Iterable<HttpField>
*/
public void put(String name, List<String> list)
{
Objects.requireNonNull(name, "name");
Objects.requireNonNull(name, "name must not be null");
remove(name);
if (list == null)
@ -736,7 +737,7 @@ public class HttpFields implements Iterable<HttpField>
*/
public void add(HttpHeader header, String value)
{
Objects.requireNonNull(header, "header");
Objects.requireNonNull(header, "header must not be null");
if (value == null)
throw new IllegalArgumentException("null value");
@ -760,7 +761,8 @@ public class HttpFields implements Iterable<HttpField>
if (f.getHeader() == name)
{
removed = f;
System.arraycopy(_fields, i + 1, _fields, i, --_size - i);
_size--;
System.arraycopy(_fields, i + 1, _fields, i, _size - i);
}
}
return removed;
@ -781,7 +783,8 @@ public class HttpFields implements Iterable<HttpField>
if (f.getName().equalsIgnoreCase(name))
{
removed = f;
System.arraycopy(_fields, i + 1, _fields, i, --_size - i);
_size--;
System.arraycopy(_fields, i + 1, _fields, i, _size - i);
}
}
return removed;
@ -1229,8 +1232,9 @@ public class HttpFields implements Iterable<HttpField>
if (field != null)
{
_fields = Arrays.copyOf(_fields, _fields.length + 1);
System.arraycopy(_fields, _cursor, _fields, _cursor + 1, _size++);
System.arraycopy(_fields, _cursor, _fields, _cursor + 1, _size - _cursor);
_fields[_cursor++] = field;
_size++;
_current = -1;
}
}

2
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
View File

@ -767,7 +767,7 @@ public class HttpFieldsTest
@Test
public void testIteration()
{
HttpFields header = new HttpFields();
HttpFields header = new HttpFields(5);
Iterator<HttpField> i = header.iterator();
assertThat(i.hasNext(), is(false));