Skip to content

Commit ec4ef5e

Browse files
authored
Fix #1186: improve recycled buffer release logic (#1187)
1 parent c844c60 commit ec4ef5e

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

release-notes/VERSION-2.x

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ a pure JSON library.
2626
#1179: Allow configuring `DefaultPrettyPrinter` separators for empty
2727
Arrays and Objects
2828
(contributed by Guillaume L)
29+
#1186: `BufferRecycler` should avoid setting replacement if one already returned, bigger
30+
(suggested by @kkkkkhhhh)
2931

3032
2.16.2 (not yet released)
3133

src/main/java/com/fasterxml/jackson/core/util/BufferRecycler.java

+12-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,12 @@ public byte[] allocByteBuffer(int ix, int minSize) {
145145
}
146146

147147
public void releaseByteBuffer(int ix, byte[] buffer) {
148-
_byteBuffers.set(ix, buffer);
148+
// 13-Jan-2024, tatu: [core#1186] Replace only if beneficial:
149+
byte[] oldBuffer = _byteBuffers.get(ix);
150+
if ((oldBuffer == null) || buffer.length > oldBuffer.length) {
151+
// Could use CAS, but should not really matter
152+
_byteBuffers.set(ix, buffer);
153+
}
149154
}
150155

151156
/*
@@ -171,7 +176,12 @@ public char[] allocCharBuffer(int ix, int minSize) {
171176
}
172177

173178
public void releaseCharBuffer(int ix, char[] buffer) {
174-
_charBuffers.set(ix, buffer);
179+
// 13-Jan-2024, tatu: [core#1186] Replace only if beneficial:
180+
char[] oldBuffer = _charBuffers.get(ix);
181+
if ((oldBuffer == null) || buffer.length > oldBuffer.length) {
182+
// Could use CAS, but should not really matter
183+
_charBuffers.set(ix, buffer);
184+
}
175185
}
176186

177187
/*

0 commit comments

Comments
 (0)