Skip to content

IO-665 ensure that passing a null InputStream results in NPE with tests #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 4 commits into from
Apr 14, 2020
Merged

IO-665 ensure that passing a null InputStream results in NPE with tests #112

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c8faf3
ensure that passing a null InputStream results in NPE with tests
ottobackwards Apr 13, 2020
0ece84f
remove stray import from bad autocomplete
ottobackwards Apr 13, 2020
73666ac
per review, fix formating for lamda () ->
ottobackwards Apr 13, 2020
2dcd21b
per review, protect other constructors
ottobackwards Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
per review, protect other constructors
  • Loading branch information
@ottobackwards
ottobackwards committed Apr 14, 2020
commit 2dcd21b60c8a6929d5fb312e9f585b4f622a2c8b
6 changes: 4 additions & 2 deletions src/main/java/org/apache/commons/io/input/XmlStreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public String getDefaultEncoding() {
* @throws IOException thrown if there is a problem reading the file.
*/
public XmlStreamReader(final File file) throws IOException {
this(new FileInputStream(file));
this(new FileInputStream(Objects.requireNonNull(file)));
}

/**
Expand Down Expand Up @@ -240,7 +240,7 @@ public XmlStreamReader(final InputStream inputStream, final boolean lenient, fin
* the URL.
*/
public XmlStreamReader(final URL url) throws IOException {
this(url.openConnection(), null);
this(Objects.requireNonNull(url, "url").openConnection(), null);
}

/**
Expand All @@ -263,6 +263,7 @@ public XmlStreamReader(final URL url) throws IOException {
* the URLConnection.
*/
public XmlStreamReader(final URLConnection conn, final String defaultEncoding) throws IOException {
Objects.requireNonNull(conn, "conm");
this.defaultEncoding = defaultEncoding;
final boolean lenient = true;
final String contentType = conn.getContentType();
Expand Down Expand Up @@ -335,6 +336,7 @@ public XmlStreamReader(final InputStream inputStream, final String httpContentTy
*/
public XmlStreamReader(final InputStream inputStream, final String httpContentType,
final boolean lenient, final String defaultEncoding) throws IOException {
Objects.requireNonNull(inputStream, "inputStream");
this.defaultEncoding = defaultEncoding;
final BOMInputStream bom = new BOMInputStream(new BufferedInputStream(inputStream, BUFFER_SIZE), false, BOMS);
final BOMInputStream pis = new BOMInputStream(bom, true, XML_GUESS_BYTES);
Expand Down