Skip to content

Commit a19ceca

Browse files
committed
call removeCloseListener
1 parent ed89f2f commit a19ceca

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueue.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -932,9 +932,14 @@ private ToIntFunction<String> fileNameToCycleFunction() {
932932
return name -> dateCache.parseCount(name.substring(0, name.length() - SUFFIX.length()));
933933
}
934934

935+
@Deprecated(/* to be removed in x.25 */)
935936
void removeCloseListener(final StoreTailer storeTailer) {
937+
removeCloseListener((java.io.Closeable) storeTailer);
938+
}
939+
940+
void removeCloseListener(final java.io.Closeable closeable) {
936941
synchronized (closers) {
937-
closers.removeIf(wrc -> wrc.get() == storeTailer);
942+
closers.removeIf(wrc -> wrc.get() == closeable);
938943
}
939944
}
940945

src/main/java/net/openhft/chronicle/queue/impl/single/StoreAppender.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ public void writeBytes(@NotNull final WriteBytesMarshallable marshallable) {
209209

210210
@Override
211211
protected void performClose() {
212+
queue.removeCloseListener(this);
213+
212214
releaseBytesFor(wireForIndex);
213215
releaseBytesFor(wire);
214216
releaseBytesFor(bufferWire);

src/main/java/net/openhft/chronicle/queue/impl/single/StoreTailer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ public DocumentContext readingDocument() {
156156

157157
@Override
158158
protected void performClose() {
159+
queue.removeCloseListener((java.io.Closeable) this);
159160
Closeable.closeQuietly(indexValue);
160161
// the wire ref count will be released here by setting it to null
161162
context.wire(null);

0 commit comments

Comments
 (0)