This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit fba377f5fa876fd192fe071e28792951c569f789 Author: tibordigana <tibordig...@apache.org> AuthorDate: Wed Sep 30 22:07:35 2020 +0200 avoided unnecessary string encoding (faster in 25 ns) --- .../src/main/java/org/apache/maven/surefire/api/booter/Constants.java | 1 + .../maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java index d1be7ac..bcb7b17 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Constants.java @@ -32,4 +32,5 @@ public final class Constants public static final String MAGIC_NUMBER = "maven-surefire-event"; public static final byte[] MAGIC_NUMBER_BYTES = MAGIC_NUMBER.getBytes( US_ASCII ); public static final Charset DEFAULT_STREAM_ENCODING = UTF_8; + public static final byte[] DEFAULT_STREAM_ENCODING_BYTES = UTF_8.name().getBytes( US_ASCII ); } diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java index dba0f9b..0d8f787 100644 --- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java +++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/LegacyMasterProcessChannelEncoder.java @@ -43,6 +43,7 @@ import static java.lang.Math.ceil; import static java.nio.CharBuffer.wrap; import static java.util.Objects.requireNonNull; import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING; +import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING_BYTES; import static org.apache.maven.surefire.api.booter.Constants.MAGIC_NUMBER_BYTES; import static org.apache.maven.surefire.api.booter.ForkedProcessEventType.BOOTERCODE_BYE; import static org.apache.maven.surefire.api.booter.ForkedProcessEventType.BOOTERCODE_CONSOLE_DEBUG; @@ -476,7 +477,7 @@ public class LegacyMasterProcessChannelEncoder implements MasterProcessChannelEn String charsetName = encoder.charset().name(); result.put( (byte) charsetName.length() ); result.put( (byte) ':' ); - encoder.encode( wrap( charsetName ), result, true ); + result.put( DEFAULT_STREAM_ENCODING_BYTES ); result.put( (byte) ':' ); }