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

471985 NPE in HttpFields.putField 

The problem had several aspects:
 * HttpField.add should not let a null entry be added to the fields
 * The putHeaders methods should have checked for a null field before trying to add it
 * But the fundamental problem was the JarFileResource.close was leaving exist==true, so a new entry was never created.
This commit is contained in:
Greg Wilkins 2015-07-08 16:04:43 +10:00
parent 8c72d04415
commit 7fbf512b17
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,11 +681,14 @@ public class HttpFields implements Iterable<HttpField>
} }
public void add(HttpField field) public void add(HttpField field)
{
if (field!=null)
{ {
if (_size==_fields.length) if (_size==_fields.length)
_fields=Arrays.copyOf(_fields,_size*2); _fields=Arrays.copyOf(_fields,_size*2);
_fields[_size++]=field; _fields[_size++]=field;
} }
}
public void addAll(HttpFields fields) public void addAll(HttpFields fields)
{ {

3
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
View File

@ -57,11 +57,11 @@ class JarFileResource extends JarResource
super(url, useCaches); super(url, useCaches);
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@Override @Override
public synchronized void close() public synchronized void close()
{ {
_exists=false;
_list=null; _list=null;
_entry=null; _entry=null;
_file=null; _file=null;
@ -144,7 +144,6 @@ class JarFileResource extends JarResource
if (_urlString.endsWith("!/")) if (_urlString.endsWith("!/"))
{ {
String file_url=_urlString.substring(4,_urlString.length()-2); String file_url=_urlString.substring(4,_urlString.length()-2);
try{return newResource(file_url).exists();} try{return newResource(file_url).exists();}
catch(Exception e) {LOG.ignore(e); return false;} catch(Exception e) {LOG.ignore(e); return false;}