Merge branch '2.17' into 2.18

FasterXML · Apr 10, 2024 · 9b4d2d9 · 9b4d2d9
2 parents 1eda007 + c9bd7fc
commit 9b4d2d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/cfg/MapperConfiguratorBase.java
@@ -19,21 +19,21 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
      * If defined (explicitly or implicitly) it will be used, instead
      * of using provider-based lookup.
      */
-    protected MAPPER _mapper;
+    protected volatile MAPPER _mapper;
 
     /**
      * If no mapper was specified when constructed, and no configuration
      * calls are made, a default mapper is constructed. The difference
      * between default mapper and regular one is that default mapper
      * is only used if no mapper is found via provider lookup.
      */
-    protected MAPPER _defaultMapper;
+    protected volatile MAPPER _defaultMapper;
 
     /**
      * Annotations set to use by default; overridden by explicit call
-     * to {@link #setAnnotationsToUse}
+     * to {@link #setAnnotationsToUse}. Marked final in v2.17.1.
      */
-    protected Annotations[] _defaultAnnotationsToUse;
+    protected final Annotations[] _defaultAnnotationsToUse;
 
     /**
      * To support optional dependency to Jackson JAXB annotations module

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -92,7 +92,9 @@ PJ Fanning (@pjfanning)
   block using `LRUMap` _writers instance
  (2.14.2)
 * Contributed #184: Use `ReentrantLock`s instead of synchronized blocks
- (2.18.0)
+ (2.17.1)
+* Contributed #187: Mark variables as volatile for safe concurrent access
+ (2.17.1)
 
 Steven Schlansker (@stevenschlansker)
 

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -18,6 +18,8 @@ No changes since 2.17
 
 #184: Use `ReentrantLock`s instead of synchronized blocks
  (contributed by @pjfanning)
+#187: Mark variables as volatile for safe concurrent access
+ (contributed by @pjfanning)
 
 2.17.0 (12-Mar-2024)