#3058 - upgrading spring boot

NationalSecurityAgency · Dec 27, 2024 · f05c361 · f05c361
1 parent 4dc68b6
commit f05c361
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
@@ -63,6 +63,9 @@ spring:
       location: ${java.io.tmpdir}
       max-file-size: ${skills.config.maxAttachmentSize}
       max-request-size: ${skills.config.maxAttachmentSize}
+#  http:
+#    client:
+#      factory: simple
 management:
   server:
     port: 8808

diff --git a/service/src/test/java/skills/intTests/utils/RestTemplateWrapper.groovy b/service/src/test/java/skills/intTests/utils/RestTemplateWrapper.groovy
@@ -88,8 +88,11 @@ class RestTemplateWrapper extends RestTemplate {
             HttpHeaders headers = response.getHeaders();
 
             List<String> returnedCookies = headers.getOrEmpty(HttpHeaders.SET_COOKIE)
-            if (returnedCookies && cookies == null) {
-                cookies = returnedCookies
+            if (returnedCookies /*&& cookies == null*/) {
+                if (cookies == null) {
+                    cookies = []
+                }
+                cookies.addAll(returnedCookies)
                 log.info("Setting cookies to {}", returnedCookies)
             }
             if (returnedCookies && !xsrfToken) {