Merge pull request #9553 from oztimpower/ext/aws-lambda-8964

Amazon Lambda Test Framework - Improved error handling for shutdown

Author: patriot1burke

extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java

@@ -54,17 +54,20 @@ public void run() {
                                 URL url = AmazonLambdaApi.invocationResponse(requestId);
                                 if (isStream()) {
                                     HttpURLConnection responseConnection = responseStream(url);
-                                    processRequest(requestConnection.getInputStream(), responseConnection.getOutputStream(),
-                                            createContext(requestConnection));
-                                    while (responseConnection.getInputStream().read() != -1) {
-                                        // Read data
+                                    if (running.get()) {
+                                        processRequest(requestConnection.getInputStream(), responseConnection.getOutputStream(),
+                                                createContext(requestConnection));
+                                        while (responseConnection.getInputStream().read() != -1) {
+                                            // Read data
+                                        }
                                     }
                                 } else {
                                     Object input = null;
-                                    if (getInputReader() != null)
+                                    if (running.get() && getInputReader() != null) {
                                         input = getInputReader().readValue(requestConnection.getInputStream());
-                                    Object output = processRequest(input, createContext(requestConnection));
-                                    postResponse(url, output);
+                                        Object output = processRequest(input, createContext(requestConnection));
+                                        postResponse(url, output);
+                                    }
                                 }
                             } catch (Exception e) {
                                 log.error("Failed to run lambda", e);
@@ -82,7 +85,10 @@ public void run() {
                             }
                             return;
                         } finally {
-                            requestConnection.getInputStream().close();
+                            try {
+                                requestConnection.getInputStream().close();
+                            } catch (IOException e) {
+                            }
                         }
 
                     }

test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java

@@ -36,7 +36,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
                 Map.Entry<String, String> req = null;
                 while (req == null) {
                     req = LambdaClient.REQUEST_QUEUE.poll(100, TimeUnit.MILLISECONDS);
-                    if (undertow == null || undertow.getWorker().isShutdown()) {
+                    if (undertow == null || undertow.getWorker() == null || undertow.getWorker().isShutdown()) {
                         return;
                     }
                 }