Merge branch '1.3.x'

micronaut-projects · Jun 24, 2020 · 9cedbb8 · 9cedbb8
2 parents 3dc3eb5 + 5ae77a1
commit 9cedbb8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -34,6 +34,12 @@ jobs:
       run: |
         ./gradlew pTML
         ./gradlew check --no-daemon --parallel --continue
+    - name: Publish Test Report
+      if: failure()
+      uses: scacap/action-surefire-report@v1
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        report_paths: '**/build/test-results/test/TEST-*.xml'      
     - name: Publish to JFrog OSS
       if: success() && github.event_name == 'push' && matrix.java == '8' && github.ref == 'refs/heads/master'
       env:

diff --git a/build.gradle b/build.gradle
@@ -751,7 +751,9 @@ subprojects { Project subproject ->
             System.out.print(".")
             System.out.flush()
         }
-
+        reports {
+          junitXml.enabled = true
+        }    
         systemProperty "micronaut.cloud.platform", "OTHER"
     }
 

diff --git a/http-netty/src/main/java/io/micronaut/http/netty/NettyMutableHttpResponse.java b/http-netty/src/main/java/io/micronaut/http/netty/NettyMutableHttpResponse.java
@@ -58,9 +58,8 @@ public class NettyMutableHttpResponse<B> implements MutableHttpResponse<B>, Nett
     final NettyHttpHeaders headers;
     private final ConversionService conversionService;
     private Object body;
-    private final Map<Class, Optional> convertedBodies = new LinkedHashMap<>(1);
+    private final Map<Class, Optional> convertedBodies = Collections.synchronizedMap(new LinkedHashMap<>(1));
     private MutableConvertibleValues<Object> attributes;
-
     private ServerCookieEncoder serverCookieEncoder = DEFAULT_SERVER_COOKIE_ENCODER;
 
     /**