Skip to content

Commit 2e321dc

Browse files
turbanoffmrserb
authored andcommittedSep 9, 2021
8273528: Avoid ByteArrayOutputStream.toByteArray when converting stream to String
Reviewed-by: bpb, xuelei, serb, aivanov
1 parent 54dee13 commit 2e321dc

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed
 

‎src/java.base/share/classes/sun/security/util/BitArray.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -261,7 +261,7 @@ public String toString() {
261261
out.write(get(i) ? '1' : '0');
262262
}
263263

264-
return new String(out.toByteArray());
264+
return out.toString();
265265

266266
}
267267

‎src/java.desktop/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private String readNullTerminatedString(Charset charset, int maxLen) throws IOEx
228228
if (b != 0) {
229229
throw new IIOException("Found non null terminated string");
230230
}
231-
return new String(baos.toByteArray(), charset);
231+
return baos.toString(charset);
232232
}
233233

234234
private void readHeader() throws IIOException {

‎src/java.desktop/share/classes/sun/awt/DebugSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public String toString() {
134134
String value = props.getProperty(key, "");
135135
pout.println(key + " = " + value);
136136
}
137-
return new String(bout.toByteArray());
137+
return bout.toString();
138138
}
139139

140140
/*

‎src/java.desktop/share/classes/sun/awt/datatransfer/DataTransferer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -945,10 +945,9 @@ public byte[] translateTransferable(Transferable contents,
945945
}
946946

947947
if (DataFlavorUtil.isFlavorCharsetTextType(flavor) && isTextFormat(format)) {
948-
byte[] bytes = bos.toByteArray();
949948
String sourceEncoding = DataFlavorUtil.getTextCharset(flavor);
950949
return translateTransferableString(
951-
new String(bytes, sourceEncoding),
950+
bos.toString(sourceEncoding),
952951
format);
953952
}
954953
theByteArray = bos.toByteArray();

0 commit comments

Comments
 (0)
Please sign in to comment.