diff --git a/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java b/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java index 5837b31f2..b07b616c3 100644 --- a/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java +++ b/aws-greengrass-core-sdk-java-master/samples/HelloWorld/src/main/java/com/amazonaws/greengrass/examples/HelloWorld.java @@ -33,6 +33,7 @@ public String handleRequest(Object input, Context context) { } } +// test PR class PublishHelloWorld extends TimerTask { private IotDataClient iotDataClient = new IotDataClient(); private String publishMessage = String.format("Hello world! Sent from Greengrass Core running on platform: %s-%s using Java", System.getProperty("os.name"), System.getProperty("os.version")); diff --git a/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java b/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java index 7855ba50b..f52b9db23 100644 --- a/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java +++ b/aws-sdk-java-v2-master/http-clients/apache-client/src/main/java/software/amazon/awssdk/http/apache/ApacheHttpClient.java @@ -114,6 +114,7 @@ public final class ApacheHttpClient implements SdkHttpClient { private final ApacheHttpRequestConfig requestConfig; private final AttributeMap resolvedOptions; + // code change to fix the bug @SdkTestInternalApi ApacheHttpClient(ConnectionManagerAwareHttpClient httpClient, ApacheHttpRequestConfig requestConfig, diff --git a/aws-sdk-java-v2-master/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java b/aws-sdk-java-v2-master/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java index be2931f01..1a557e8e2 100644 --- a/aws-sdk-java-v2-master/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java +++ b/aws-sdk-java-v2-master/http-clients/netty-nio-client/src/main/java/software/amazon/awssdk/http/nio/netty/NettyNioAsyncHttpClient.java @@ -210,7 +210,7 @@ private void closeEventLoopUninterruptibly(EventLoopGroup eventLoopGroup) throws Thread.currentThread().interrupt(); throw new RuntimeException(e); } catch (TimeoutException e) { - log.error(String.format("Shutting down Netty EventLoopGroup did not complete within %s seconds", + log.error(String.format("Shutting down Netty EventLoopGroup did not complete within %d seconds", EVENTLOOP_SHUTDOWN_FUTURE_TIMEOUT_SECONDS)); } } diff --git a/aws-xray-sdk-java-master/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/internal/UnsignedXrayClient.java b/aws-xray-sdk-java-master/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/internal/UnsignedXrayClient.java index da1b80855..78dc0ab8b 100644 --- a/aws-xray-sdk-java-master/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/internal/UnsignedXrayClient.java +++ b/aws-xray-sdk-java-master/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/internal/UnsignedXrayClient.java @@ -176,7 +176,7 @@ private static String readResponseString(HttpURLConnection connection) { try { return os.toString(StandardCharsets.UTF_8.name()); } catch (UnsupportedEncodingException e) { - throw new IllegalStateException("UTF-8 not supported can't happen."); + throw new IllegalStateException("UTF-8 not supported can't happen.", e); } }