Skip to content

8297211: Expensive fillInStackTrace operation in HttpURLConnection.getOutputStream0 when no content-length in response #918

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

Closed
benty-amzn wants to merge 2 commits into from
Closed

8297211: Expensive fillInStackTrace operation in HttpURLConnection.getOutputStream0 when no content-length in response #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfdaa29
Backport 392ac7055d4697c56fa85ac5572f5bc4dc431f1d
benty-amzn Nov 22, 2022
efe5dae
Merge branch 'master' of https://git.openjdk.org/jdk17u-dev into 8297211
benty-amzn Dec 2, 2022
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
32 changes: 19 additions & 13 deletions src/java.base/share/classes/java/net/URLConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1995, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -611,10 +611,12 @@ public Map<String,List<String>> getHeaderFields() {
* missing or malformed.
*/
public int getHeaderFieldInt(String name, int Default) {
String value = getHeaderField(name);
try {
return Integer.parseInt(value);
} catch (Exception e) { }
final String value = getHeaderField(name);
if (value != null) {
try {
return Integer.parseInt(value);
} catch (NumberFormatException e) { }
}
return Default;
}

Expand All @@ -634,10 +636,12 @@ public int getHeaderFieldInt(String name, int Default) {
* @since 1.7
*/
public long getHeaderFieldLong(String name, long Default) {
String value = getHeaderField(name);
try {
return Long.parseLong(value);
} catch (Exception e) { }
final String value = getHeaderField(name);
if (value != null) {
try {
return Long.parseLong(value);
} catch (NumberFormatException e) { }
}
return Default;
}

Expand All @@ -659,10 +663,12 @@ public long getHeaderFieldLong(String name, long Default) {
*/
@SuppressWarnings("deprecation")
public long getHeaderFieldDate(String name, long Default) {
String value = getHeaderField(name);
try {
return Date.parse(value);
} catch (Exception e) { }
final String value = getHeaderField(name);
if (value != null) {
try {
return Date.parse(value);
} catch (Exception e) { }
}
return Default;
}

Expand Down
9 changes: 6 additions & 3 deletions src/java.base/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1938,9 +1938,12 @@ private InputStream getInputStream0() throws IOException {
continue;
}

try {
cl = Long.parseLong(responses.findValue("content-length"));
} catch (Exception exc) { };
final String contentLengthVal = responses.findValue("content-length");
if (contentLengthVal != null) {
try {
cl = Long.parseLong(contentLengthVal);
} catch (NumberFormatException nfe) { }
}

if (method.equals("HEAD") || cl == 0 ||
respCode == HTTP_NOT_MODIFIED ||
Expand Down