Skip to content
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

Avoid large allocations of temporary buffers in BuferUtil #5045

Merged
merged 2 commits into from
Jul 15, 2020
Merged

Avoid large allocations of temporary buffers in BuferUtil #5045

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1554768
Avoid large allocations of tmp buffers in buferutil
SerCeMan Jul 15, 2020
99d1926
review feedback
SerCeMan Jul 15, 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
4 changes: 3 additions & 1 deletion jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,10 +553,12 @@ public static void writeTo(ByteBuffer buffer, OutputStream out) throws IOExcepti
}
else
{
byte[] bytes = new byte[TEMP_BUFFER_SIZE];
byte[] bytes = null;
while (buffer.hasRemaining())
{
int byteCountToWrite = Math.min(buffer.remaining(), TEMP_BUFFER_SIZE);
if (bytes == null)
bytes = new byte[byteCountToWrite];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually slight change would be better. No need to assign the buffer in the loop:

Suggested change
byte[] bytes = null;
while (buffer.hasRemaining())
{
int byteCountToWrite = Math.min(buffer.remaining(), TEMP_BUFFER_SIZE);
if (bytes == null)
bytes = new byte[byteCountToWrite];
byte[] bytes = new byte[Math.min(buffer.remaining(), TEMP_BUFFER_SIZE)];
while (buffer.hasRemaining())
{

buffer.get(bytes, 0, byteCountToWrite);
out.write(bytes, 0, byteCountToWrite);
}
Expand Down