From 11ade2d6cf40a3a059909422df3bd67acb520172 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 12 Oct 2023 15:56:52 -0700
Subject: [PATCH 1/5] Prepare for 2.15.3 release

---
 pom.xml                   | 2 +-
 release-notes/VERSION-2.x | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab1bbf467..e68408d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.15.3-SNAPSHOT</version>
+    <version>2.15.3</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index a4649cbdf..01a7f378e 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,7 +14,7 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.15.3 (not yet released)
+2.15.3 (12-Oct-2023)
 
 #384: `Smile` decoding issue with `NonBlockingByteArrayParser`, concurrency
  (reported by Simon D)

From 7260e10622d8c3744763d46656e15e58f2486e9e Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 12 Oct 2023 17:29:32 -0700
Subject: [PATCH 2/5] [maven-release-plugin] prepare release
 jackson-dataformats-binary-2.15.3

---
 avro/pom.xml     | 2 +-
 cbor/pom.xml     | 2 +-
 ion/pom.xml      | 2 +-
 pom.xml          | 6 +++---
 protobuf/pom.xml | 2 +-
 smile/pom.xml    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/avro/pom.xml b/avro/pom.xml
index 3b9f8ccaa..99b9b4851 100644
--- a/avro/pom.xml
+++ b/avro/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3-SNAPSHOT</version>
+    <version>2.15.3</version>
   </parent>
   <artifactId>jackson-dataformat-avro</artifactId>
   <name>Jackson dataformat: Avro</name>
diff --git a/cbor/pom.xml b/cbor/pom.xml
index 6248ed8b1..d93648b32 100644
--- a/cbor/pom.xml
+++ b/cbor/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3-SNAPSHOT</version>
+    <version>2.15.3</version>
   </parent>
   <artifactId>jackson-dataformat-cbor</artifactId>
   <name>Jackson dataformat: CBOR</name>
diff --git a/ion/pom.xml b/ion/pom.xml
index ad3143b38..01127594a 100644
--- a/ion/pom.xml
+++ b/ion/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3-SNAPSHOT</version>
+    <version>2.15.3</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-ion</artifactId>
diff --git a/pom.xml b/pom.xml
index e68408d58..f4627ea04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>
   <name>Jackson dataformats: Binary</name>
-  <version>2.15.3-SNAPSHOT</version>
+  <version>2.15.3</version>
   <packaging>pom</packaging>
   <description>Parent pom for Jackson binary dataformats.
   </description>
@@ -35,7 +35,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</developerConnection>
     <url>https://github.com/FasterXML/jackson-dataformats-binary</url>
-    <tag>HEAD</tag>
+    <tag>jackson-dataformats-binary-2.15.3</tag>
   </scm>
   <issueManagement>
     <url>https://github.com/FasterXML/jackson-dataformats-binary/issues</url>
@@ -45,7 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- for Reproducible Builds -->
-    <project.build.outputTimestamp>2023-05-30T23:51:38Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-10-13T00:28:52Z</project.build.outputTimestamp>
     
     <!-- 20-Mar-2021, tatu: limit heap for tests to catch some
 	 of "too big allocation" cases
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index 394e8b5ac..817ec418a 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3-SNAPSHOT</version>
+    <version>2.15.3</version>
   </parent>
   <artifactId>jackson-dataformat-protobuf</artifactId>
   <name>Jackson dataformat: protobuf</name>
diff --git a/smile/pom.xml b/smile/pom.xml
index 39f20a12d..79dc4c2a6 100644
--- a/smile/pom.xml
+++ b/smile/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3-SNAPSHOT</version>
+    <version>2.15.3</version>
   </parent>
   <artifactId>jackson-dataformat-smile</artifactId>
   <name>Jackson dataformat: Smile</name>

From ded6f72c945df0ef481fe16a0c4112550e3f471a Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 12 Oct 2023 17:29:35 -0700
Subject: [PATCH 3/5] [maven-release-plugin] prepare for next development
 iteration

---
 avro/pom.xml     | 2 +-
 cbor/pom.xml     | 2 +-
 ion/pom.xml      | 2 +-
 pom.xml          | 6 +++---
 protobuf/pom.xml | 2 +-
 smile/pom.xml    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/avro/pom.xml b/avro/pom.xml
index 99b9b4851..c3bbb2b43 100644
--- a/avro/pom.xml
+++ b/avro/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-avro</artifactId>
   <name>Jackson dataformat: Avro</name>
diff --git a/cbor/pom.xml b/cbor/pom.xml
index d93648b32..2218c69db 100644
--- a/cbor/pom.xml
+++ b/cbor/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-cbor</artifactId>
   <name>Jackson dataformat: CBOR</name>
diff --git a/ion/pom.xml b/ion/pom.xml
index 01127594a..3dc8e02b0 100644
--- a/ion/pom.xml
+++ b/ion/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-ion</artifactId>
diff --git a/pom.xml b/pom.xml
index f4627ea04..cc9022af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>
   <name>Jackson dataformats: Binary</name>
-  <version>2.15.3</version>
+  <version>2.15.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Parent pom for Jackson binary dataformats.
   </description>
@@ -35,7 +35,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</developerConnection>
     <url>https://github.com/FasterXML/jackson-dataformats-binary</url>
-    <tag>jackson-dataformats-binary-2.15.3</tag>
+    <tag>HEAD</tag>
   </scm>
   <issueManagement>
     <url>https://github.com/FasterXML/jackson-dataformats-binary/issues</url>
@@ -45,7 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- for Reproducible Builds -->
-    <project.build.outputTimestamp>2023-10-13T00:28:52Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2023-10-13T00:29:34Z</project.build.outputTimestamp>
     
     <!-- 20-Mar-2021, tatu: limit heap for tests to catch some
 	 of "too big allocation" cases
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index 817ec418a..bcc3ea601 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-protobuf</artifactId>
   <name>Jackson dataformat: protobuf</name>
diff --git a/smile/pom.xml b/smile/pom.xml
index 79dc4c2a6..2aab81d12 100644
--- a/smile/pom.xml
+++ b/smile/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-smile</artifactId>
   <name>Jackson dataformat: Smile</name>

From bb3f6004f49282a1640f53913a1d33b75bbb7e91 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 12 Oct 2023 17:34:40 -0700
Subject: [PATCH 4/5] Back to snapshot deps

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cc9022af2..167d148a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.15.3</version>
+    <version>2.15.4-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>

From 5bffe8b7776802915b5f4ee4d7ccc47976b6cfdc Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 14 Oct 2023 20:30:34 -0700
Subject: [PATCH 5/5] First part of fix for #400 (#405)

---
 .../jackson/dataformat/avro/AvroFactory.java  | 11 ++-
 .../dataformat/avro/AvroGenerator.java        | 24 +++++--
 .../avro/apacheimpl/ApacheAvroFactory.java    |  2 +
 .../avro/apacheimpl/ApacheAvroParserImpl.java | 34 +++++++--
 .../avro/apacheimpl/ApacheCodecRecycler.java  | 70 +++++++++++++------
 .../avro/apacheimpl/AvroRecyclerPools.java    | 70 +++++++++++++++++++
 6 files changed, 175 insertions(+), 36 deletions(-)
 create mode 100644 avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/AvroRecyclerPools.java

diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactory.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactory.java
index 401dd7727..3fd43ffa7 100644
--- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactory.java
+++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactory.java
@@ -7,7 +7,9 @@
 import com.fasterxml.jackson.core.format.InputAccessor;
 import com.fasterxml.jackson.core.format.MatchStrength;
 import com.fasterxml.jackson.core.io.IOContext;
-
+import com.fasterxml.jackson.core.util.RecyclerPool;
+import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheCodecRecycler;
+import com.fasterxml.jackson.dataformat.avro.apacheimpl.AvroRecyclerPools;
 import com.fasterxml.jackson.dataformat.avro.deser.*;
 
 /**
@@ -40,6 +42,12 @@ public class AvroFactory extends JsonFactory
     /**********************************************************
      */
 
+    /**
+     * @since 2.16
+     */
+    protected RecyclerPool<ApacheCodecRecycler> _avroRecyclerPool
+        = AvroRecyclerPools.defaultPool();
+
     protected int _avroParserFeatures;
 
     protected int _avroGeneratorFeatures;
@@ -463,6 +471,7 @@ protected AvroGenerator _createGenerator(OutputStream out, IOContext ctxt) throw
     {
         int feats = _avroGeneratorFeatures;
         AvroGenerator gen = new AvroGenerator(ctxt, _generatorFeatures, feats,
+                _avroRecyclerPool.acquireAndLinkPooled(),
                 _objectCodec, out);
         return gen;
     }
diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java
index 62098920e..18e86c798 100644
--- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java
+++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroGenerator.java
@@ -93,7 +93,12 @@ private Feature(boolean defaultState) {
      * @since 2.16
      */
     protected final static EncoderFactory ENCODER_FACTORY = EncoderFactory.get();
-    
+
+    /**
+     * @since 2.16
+     */
+    protected ApacheCodecRecycler _apacheCodecRecycler;
+
     /**
      * @since 2.16
      */
@@ -144,6 +149,7 @@ private Feature(boolean defaultState) {
      */
 
     public AvroGenerator(IOContext ctxt, int jsonFeatures, int avroFeatures,
+            ApacheCodecRecycler apacheCodecRecycler,
             ObjectCodec codec, OutputStream output)
         throws IOException
     {
@@ -153,8 +159,9 @@ public AvroGenerator(IOContext ctxt, int jsonFeatures, int avroFeatures,
         _output = output;
         _avroContext = AvroWriteContext.nullContext();
 
+        _apacheCodecRecycler = apacheCodecRecycler;
         final boolean buffering = isEnabled(Feature.AVRO_BUFFERING);
-        BinaryEncoder encoderToReuse = ApacheCodecRecycler.acquireEncoder();
+        BinaryEncoder encoderToReuse = _apacheCodecRecycler.acquireEncoder();
         _encoder = buffering
                 ? ENCODER_FACTORY.binaryEncoder(output, encoderToReuse)
                 : ENCODER_FACTORY.directBinaryEncoder(output, encoderToReuse);
@@ -626,10 +633,15 @@ protected final void _verifyValueWrite(String typeMsg) throws IOException {
     @Override
     protected void _releaseBuffers() {
         // no super implementation to call
-        BinaryEncoder e = _encoder;
-        if (e != null) {
-            _encoder = null;
-            ApacheCodecRecycler.release(e);
+        ApacheCodecRecycler recycler = _apacheCodecRecycler;
+        if (recycler != null) {
+            _apacheCodecRecycler = null;
+            BinaryEncoder e = _encoder;
+            if (e != null) {
+                _encoder = null;
+                recycler.release(e);
+            }
+            recycler.releaseToPool();
         }
     }
 
diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroFactory.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroFactory.java
index b6b4c9aff..a15bc96fd 100644
--- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroFactory.java
+++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroFactory.java
@@ -45,12 +45,14 @@ public AvroFactory copy()
     @Override
     protected AvroParser _createParser(InputStream in, IOContext ctxt) throws IOException {
         return new ApacheAvroParserImpl(ctxt, _parserFeatures, _avroParserFeatures,
+                _avroRecyclerPool.acquireAndLinkPooled(),
                 _objectCodec, in);
     }
 
     @Override
     protected AvroParser _createParser(byte[] data, int offset, int len, IOContext ctxt) throws IOException {
         return new ApacheAvroParserImpl(ctxt, _parserFeatures, _avroParserFeatures,
+                _avroRecyclerPool.acquireAndLinkPooled(),
                 _objectCodec, data, offset, len);
     }
 }
diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java
index 4c49115d9..ff1c69c09 100644
--- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java
+++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java
@@ -5,6 +5,7 @@
 import java.io.Writer;
 
 import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.DecoderFactory;
 
 import com.fasterxml.jackson.core.*;
@@ -18,11 +19,22 @@
  */
 public class ApacheAvroParserImpl extends AvroParserImpl
 {
+    /*
+    /**********************************************************
+    /* Configuration
+    /**********************************************************
+     */
+
     /**
      * @since 2.16
      */
     protected final static DecoderFactory DECODER_FACTORY = DecoderFactory.get();
 
+    /**
+     * @since 2.16
+     */
+    protected ApacheCodecRecycler _apacheCodecRecycler;
+
     /*
     /**********************************************************
     /* Input source config
@@ -71,6 +83,7 @@ public class ApacheAvroParserImpl extends AvroParserImpl
      */
 
     public ApacheAvroParserImpl(IOContext ctxt, int parserFeatures, int avroFeatures,
+            ApacheCodecRecycler apacheCodecRecycler,
             ObjectCodec codec, InputStream in)
     {
         super(ctxt, parserFeatures, avroFeatures, codec);
@@ -80,20 +93,23 @@ public ApacheAvroParserImpl(IOContext ctxt, int parserFeatures, int avroFeatures
         _inputEnd = 0;
         _bufferRecyclable = true;
 
+        _apacheCodecRecycler = apacheCodecRecycler;
         final boolean buffering = Feature.AVRO_BUFFERING.enabledIn(avroFeatures);
-        BinaryDecoder decoderToReuse = ApacheCodecRecycler.acquireDecoder();
+        BinaryDecoder decoderToReuse = apacheCodecRecycler.acquireDecoder();
         _decoder = buffering
                 ? DECODER_FACTORY.binaryDecoder(in, decoderToReuse)
                 : DECODER_FACTORY.directBinaryDecoder(in, decoderToReuse);
     }
 
     public ApacheAvroParserImpl(IOContext ctxt, int parserFeatures, int avroFeatures,
+            ApacheCodecRecycler apacheCodecRecycler,
             ObjectCodec codec,
             byte[] buffer, int offset, int len)
     {
         super(ctxt, parserFeatures, avroFeatures, codec);
         _inputStream = null;
-        BinaryDecoder decoderToReuse = ApacheCodecRecycler.acquireDecoder();
+        _apacheCodecRecycler = apacheCodecRecycler;
+        BinaryDecoder decoderToReuse = apacheCodecRecycler.acquireDecoder();
         _decoder = DECODER_FACTORY.binaryDecoder(buffer, offset, len, decoderToReuse);
     }
 
@@ -107,14 +123,18 @@ protected void _releaseBuffers() throws IOException {
                 _ioContext.releaseReadIOBuffer(buf);
             }
         }
-        BinaryDecoder d = _decoder;
-        if (d != null) {
-            _decoder = null;
-            ApacheCodecRecycler.release(d);
+        ApacheCodecRecycler recycler = _apacheCodecRecycler;
+        if (recycler != null) {
+            _apacheCodecRecycler = null;
+            BinaryDecoder d = _decoder;
+            if (d != null) {
+                _decoder = null;
+                recycler.release(d);
+            }
+            recycler.releaseToPool();
         }
     }
 
-
     /*
     /**********************************************************
     /* Abstract method impls, i/o access
diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheCodecRecycler.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheCodecRecycler.java
index f0f99861d..dadc7a5e5 100644
--- a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheCodecRecycler.java
+++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheCodecRecycler.java
@@ -1,8 +1,11 @@
 package com.fasterxml.jackson.dataformat.avro.apacheimpl;
 
-import java.lang.ref.SoftReference;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.fasterxml.jackson.core.util.RecyclerPool;
+import com.fasterxml.jackson.core.util.RecyclerPool.WithPool;
+
 import org.apache.avro.io.*;
 
 /**
@@ -12,14 +15,14 @@
  * @since 2.8.7
  */
 public final class ApacheCodecRecycler
+    implements WithPool<ApacheCodecRecycler>
 {
-    protected final static ThreadLocal<SoftReference<ApacheCodecRecycler>> _recycler
-            = new ThreadLocal<SoftReference<ApacheCodecRecycler>>();
-
     private final AtomicReference<BinaryDecoder> decoderRef = new AtomicReference<>();
     private final AtomicReference<BinaryEncoder> encoderRef = new AtomicReference<>();
 
-    private ApacheCodecRecycler() { }
+    private RecyclerPool<ApacheCodecRecycler> _pool;
+
+    ApacheCodecRecycler() { }
 
     /*
     /**********************************************************
@@ -27,36 +30,59 @@ private ApacheCodecRecycler() { }
     /**********************************************************
      */
 
-    public static BinaryDecoder acquireDecoder() {
-        return _recycler().decoderRef.getAndSet(null);
+    public BinaryDecoder acquireDecoder() {
+        return decoderRef.getAndSet(null);
     }
 
-    public static BinaryEncoder acquireEncoder() {
-        return _recycler().encoderRef.getAndSet(null);
+    public BinaryEncoder acquireEncoder() {
+        return encoderRef.getAndSet(null);
     }
 
-    public static void release(BinaryDecoder dec) {
-        _recycler().decoderRef.set(dec);
+    public void release(BinaryDecoder dec) {
+        decoderRef.set(dec);
     }
 
-    public static void release(BinaryEncoder enc) {
-        _recycler().encoderRef.set(enc);
+    public void release(BinaryEncoder enc) {
+        encoderRef.set(enc);
     }
 
     /*
     /**********************************************************
-    /* Internal per-instance methods
+    /* WithPool implementation
     /**********************************************************
      */
+    
+    /**
+     * Method called by owner of this recycler instance, to provide reference to
+     * {@link RecyclerPool} into which instance is to be released (if any)
+     *
+     * @since 2.16
+     */
+    @Override
+    public ApacheCodecRecycler withPool(RecyclerPool<ApacheCodecRecycler> pool) {
+        if (this._pool != null) {
+            throw new IllegalStateException("ApacheCodecRecycler already linked to pool: "+pool);
+        }
+        // assign to pool to which this BufferRecycler belongs in order to release it
+        // to the same pool when the work will be completed
+        _pool = Objects.requireNonNull(pool);
+        return this;
+    }
 
-    private static ApacheCodecRecycler _recycler() {
-        SoftReference<ApacheCodecRecycler> ref = _recycler.get();
-        ApacheCodecRecycler r = (ref == null) ? null : ref.get();
-
-        if (r == null) {
-            r = new ApacheCodecRecycler();
-            _recycler.set(new SoftReference<>(r));
+    /**
+     * Method called when owner of this recycler no longer wishes use it; this should
+     * return it to pool passed via {@code withPool()} (if any).
+     *
+     * @since 2.16
+     */
+    @Override
+    public void releaseToPool() {
+        if (_pool != null) {
+            RecyclerPool<ApacheCodecRecycler> tmpPool = _pool;
+            // nullify the reference to the pool in order to avoid the risk of releasing
+            // the same BufferRecycler more than once, thus compromising the pool integrity
+            _pool = null;
+            tmpPool.releasePooled(this);
         }
-        return r;
     }
 }
diff --git a/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/AvroRecyclerPools.java b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/AvroRecyclerPools.java
new file mode 100644
index 000000000..2d1722e00
--- /dev/null
+++ b/avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/AvroRecyclerPools.java
@@ -0,0 +1,70 @@
+package com.fasterxml.jackson.dataformat.avro.apacheimpl;
+
+import java.lang.ref.SoftReference;
+
+import com.fasterxml.jackson.core.util.BufferRecycler;
+import com.fasterxml.jackson.core.util.RecyclerPool;
+
+public final class AvroRecyclerPools
+{
+    /**
+     * @return the default {@link RecyclerPool} implementation
+     *   which is the thread local based one:
+     *   basically alias to {@link #threadLocalPool()}).
+     */
+    public static RecyclerPool<ApacheCodecRecycler> defaultPool() {
+        return threadLocalPool();
+    }
+
+    /**
+     * Accessor for getting the shared/global {@link ThreadLocalPool} instance
+     * (due to design only one instance ever needed)
+     *
+     * @return Globally shared instance of {@link ThreadLocalPool}
+     */
+    public static RecyclerPool<ApacheCodecRecycler> threadLocalPool() {
+        return ThreadLocalPool.GLOBAL;
+    }
+
+    /*
+    /**********************************************************************
+    /* Concrete RecyclerPool implementations for recycling BufferRecyclers
+    /**********************************************************************
+     */
+
+    /**
+     * {@link ThreadLocal}-based {@link RecyclerPool} implementation used for
+     * recycling {@link BufferRecycler} instances:
+     * see {@link RecyclerPool.ThreadLocalPoolBase} for full explanation
+     * of functioning.
+     */
+    public static class ThreadLocalPool
+        extends RecyclerPool.ThreadLocalPoolBase<ApacheCodecRecycler>
+    {
+        private static final long serialVersionUID = 1L;
+
+        protected static final ThreadLocalPool GLOBAL = new ThreadLocalPool();
+
+        protected final static ThreadLocal<SoftReference<ApacheCodecRecycler>> _recycler
+            = new ThreadLocal<SoftReference<ApacheCodecRecycler>>();
+
+        private ThreadLocalPool() { }
+
+        @Override
+        public ApacheCodecRecycler acquirePooled() {
+            SoftReference<ApacheCodecRecycler> ref = _recycler.get();
+            ApacheCodecRecycler r = (ref == null) ? null : ref.get();
+
+            if (r == null) {
+                r = new ApacheCodecRecycler();
+                _recycler.set(new SoftReference<>(r));
+            }
+            return r;
+        }
+
+        // // // JDK serialization support
+
+        protected Object readResolve() { return GLOBAL; }
+    }
+    
+}