Skip to content

SimpleHttpClient fix #221

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
BobHanson merged 3 commits into from
Jul 28, 2021
Merged

SimpleHttpClient fix #221

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82d5509
Merge pull request #219 from BobHanson/hanson1
BobHanson Jul 20, 2021
1bb1206
Fix SimpleHttpClient#toBytes, make sure return value is always byte[].
warownia1 Jul 28, 2021
2d3424a
Merge pull request #220 from warownia1/master
BobHanson Jul 28, 2021
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
33 changes: 19 additions & 14 deletions sources/net.sf.j2s.java.core/src/javajs/http/SimpleHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,27 @@ public HttpRequest clearFormParts(String name) {
}

private byte[] toBytes(Object data) {
try {
if (data == null || data instanceof byte[]) {
} else if (data instanceof File) {
FileInputStream fis = new FileInputStream((File) data);
data = getBytes(fis);
fis.close();
} else if (data instanceof InputStream) {
InputStream is = (InputStream) data;
data = getBytes(is);
is.close();
} else {
data = data.toString().getBytes();
if (data == null || data instanceof byte[]) {
return (byte[]) data;
} else if (data instanceof File) {
try (FileInputStream fis = new FileInputStream((File) data)) {
return getBytes(fis);
}
} catch (IOException e) {
catch (IOException e) {
e.printStackTrace();
return null;
}
} else if (data instanceof InputStream) {
try (InputStream is = (InputStream) data) {
return getBytes(is);
}
catch (IOException e) {
e.printStackTrace();
return null;
}
} else {
return data.toString().getBytes();
}
return (byte[]) data;
}

@Override
Expand Down