From efe91c1a89c09c77f4b51b9c73fcc88298ea49d7 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 3 Apr 2024 18:51:11 -0700
Subject: [PATCH] Fix missing part of earlier merge

---
 .../tools/jackson/jaxrs/cfg/MapperConfiguratorBase.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/base/src/main/java/tools/jackson/jaxrs/cfg/MapperConfiguratorBase.java b/base/src/main/java/tools/jackson/jaxrs/cfg/MapperConfiguratorBase.java
index 26318223..3fb4e487 100644
--- a/base/src/main/java/tools/jackson/jaxrs/cfg/MapperConfiguratorBase.java
+++ b/base/src/main/java/tools/jackson/jaxrs/cfg/MapperConfiguratorBase.java
@@ -94,7 +94,9 @@ public MAPPER getDefaultMapper() {
         if (_defaultMapper == null) {
             _lock.lock();
             try {
-                _defaultMapper = _mapperWithConfiguration(mapperBuilder());
+                if (_defaultMapper == null) {
+                    _defaultMapper = _mapperWithConfiguration(mapperBuilder());
+                }
             } finally {
                 _lock.unlock();
             }
@@ -112,7 +114,9 @@ protected MAPPER mapper()
         if (_mapper == null) {
             _lock.lock();
             try {
-                _mapper = _mapperWithConfiguration(mapperBuilder());
+                if (_mapper == null) {
+                    _mapper = _mapperWithConfiguration(mapperBuilder());
+                }
             } finally {
                 _lock.unlock();
             }