From 17b883e101bc81657d726cd2a218d74aadb77cce Mon Sep 17 00:00:00 2001
From: evgeny <khokhlov.e.n@gmail.com>
Date: Tue, 21 Nov 2023 23:36:50 +0000
Subject: [PATCH] feat: throw exception when trying to attach on released
 channel

---
 .../io/ably/lib/realtime/AblyRealtime.java    |  1 +
 .../io/ably/lib/realtime/ChannelBase.java     | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java
index ffb33d426..34098ea0b 100644
--- a/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java
+++ b/lib/src/main/java/io/ably/lib/realtime/AblyRealtime.java
@@ -206,6 +206,7 @@ public Channel get(final String channelName, final ChannelOptions channelOptions
         public void release(String channelName) {
             Channel channel = map.remove(channelName);
             if(channel != null) {
+                channel.markAsReleased();
                 try {
                     channel.detach();
                 } catch (AblyException e) {
diff --git a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
index 1da00e9ba..e7728c3cc 100644
--- a/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
+++ b/lib/src/main/java/io/ably/lib/realtime/ChannelBase.java
@@ -83,6 +83,13 @@ public abstract class ChannelBase extends EventEmitter<ChannelEvent, ChannelStat
 
     private int retryCount = 0;
 
+    /**
+     * @see #markAsReleased()
+     */
+    private boolean released = false;
+
+
+
     /***
      * internal
      *
@@ -271,6 +278,13 @@ public void detach() throws AblyException {
         detach(null);
     }
 
+    /**
+     * Mark channel as released that means we can't perform any operation on this channel anymore
+     */
+    public synchronized void markAsReleased() {
+        released = true;
+    }
+
     /**
      * Detach from this channel.
      * Any resulting channel state change is emitted to any listeners registered using the
@@ -432,6 +446,7 @@ private void attachWithTimeout(final CompletionListener listener) throws AblyExc
      * set up timer to reattach it later
      */
     synchronized private void attachWithTimeout(final boolean forceReattach, final CompletionListener listener) {
+        checkChannelIsNotReleased();
         Timer currentAttachTimer;
         try {
             currentAttachTimer = new Timer();
@@ -487,6 +502,10 @@ public void run() {
                 }, Defaults.realtimeRequestTimeout);
     }
 
+    private void checkChannelIsNotReleased() {
+        if (released) throw new IllegalStateException("Can't perform any operation on released channel");
+    }
+
     /**
      * Must be called in suspended state. Wait for timeout specified in clientOptions, and then
      * try to attach the channel
@@ -539,13 +558,14 @@ synchronized private void detachWithTimeout(final CompletionListener listener) {
             callCompletionListenerError(listener, ErrorInfo.fromThrowable(t));
             return;
         }
-        attachTimer = currentDetachTimer;
+        attachTimer = released ? null : currentDetachTimer;
 
         try {
             detachImpl(new CompletionListener() {
                 @Override
                 public void onSuccess() {
                     clearAttachTimers();
+                    if (released) setDetached(null);
                     callCompletionListenerSuccess(listener);
                 }