diff --git a/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md b/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md index 2b87c611..5beabb4b 100644 --- a/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md +++ b/aws-lambda-java-runtime-interface-client/RELEASE.CHANGELOG.md @@ -1,6 +1,7 @@ -### March 15, 2023 +### March 16, 2023 `2.3.1` -- ignore module-info for CDS preparation purposes +- ignore module-info for CDS preparation purposes +- clear thread interrupted flag instead of exiting Lambda Runtime ### March 14, 2023 `2.3.0` diff --git a/aws-lambda-java-runtime-interface-client/pom.xml b/aws-lambda-java-runtime-interface-client/pom.xml index de70505e..7238bcbc 100644 --- a/aws-lambda-java-runtime-interface-client/pom.xml +++ b/aws-lambda-java-runtime-interface-client/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.amazonaws aws-lambda-java-runtime-interface-client - 2.3.0 + 2.3.1 jar AWS Lambda Java Runtime Interface Client diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java index 32b4c682..0e65af4e 100644 --- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java +++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/AWSLambda.java @@ -238,9 +238,7 @@ private static void startRuntime(String handler, LambdaLogger lambdaLogger) thro try { payload = requestHandler.call(request); runtimeClient.postInvocationResponse(request.getId(), payload.toByteArray()); - if (Thread.currentThread().isInterrupted()) { - shouldExit = true; - } + boolean ignored = Thread.interrupted(); // clear interrupted flag in case if it was set by user's code } catch (UserFault f) { userFault = f; UserFault.filterStackTrace(f); diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh b/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh index e7122b20..56d617c3 100755 --- a/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh +++ b/aws-lambda-java-runtime-interface-client/src/main/jni/build-jni-lib.sh @@ -6,7 +6,7 @@ set -euo pipefail SRC_DIR=$(dirname "$0") DST_DIR=${1} MULTI_ARCH=${2} -CURL_VERSION=7.86.0 +CURL_VERSION=7.83.1 # Not using associative arrays to maintain bash 3 compatibility with building on MacOS # MacOS ships with bash 3 and associative arrays require bash 4+ diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.83.1.tar.gz b/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.83.1.tar.gz new file mode 100644 index 00000000..b71926a3 Binary files /dev/null and b/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.83.1.tar.gz differ diff --git a/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.86.0.tar.gz b/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.86.0.tar.gz deleted file mode 100644 index 650bee5b..00000000 Binary files a/aws-lambda-java-runtime-interface-client/src/main/jni/deps/curl-7.86.0.tar.gz and /dev/null differ diff --git a/aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml b/aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml index abcdd1a3..b8184a86 100644 --- a/aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml +++ b/aws-lambda-java-runtime-interface-client/test/integration/test-handler/pom.xml @@ -15,7 +15,7 @@ com.amazonaws aws-lambda-java-runtime-interface-client - 2.3.0 + 2.3.1 diff --git a/aws-lambda-java-serialization/pom.xml b/aws-lambda-java-serialization/pom.xml index 6395ce24..d87f2b29 100644 --- a/aws-lambda-java-serialization/pom.xml +++ b/aws-lambda-java-serialization/pom.xml @@ -216,10 +216,6 @@ com.google.gson ${relocation.prefix}.com.google.gson - - org.joda.time - ${relocation.prefix}.org.joda.time - org.json ${relocation.prefix}.org.json