From b00207ab5b691aa1c450add19dac99b280b2db54 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:55:49 +0200
Subject: [PATCH 1/2] mark variables as volatile (#187)

---
 .../jackson/jaxrs/cfg/MapperConfiguratorBase.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 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
index ad3dc06a..2b8d7b63 100644
--- 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,7 +19,7 @@ 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
@@ -27,13 +27,13 @@ public abstract class MapperConfiguratorBase<IMPL extends MapperConfiguratorBase
      * 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

From c9bd7fc7aa32bccaa5ae0fa460268afca8366d53 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 10 Apr 2024 15:58:24 -0700
Subject: [PATCH 2/2] Update release notes

---
 release-notes/CREDITS-2.x | 4 +++-
 release-notes/VERSION-2.x | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
index b0168b67..9f4a91c8 100644
--- 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
index 128964c1..a7aa8bb4 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,6 +14,8 @@ Sub-modules:
 
 #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)