hot rod client: RemoteCache.removeClient method does not remove the listener from the list after server restart

After registering a client listener in the client and then restarting the infinispan server --> The original listener object can not be removed from the client listener list by using the method RemoteCache.removeClient(Object listener) --> after calling this method and then get all listeners, i still see the old listener in the list.

By doing a little debug, it seems that in class RemoveClientListenerOperation.execute when trying to remove from the server and a failure status is returned (probably due to the fact the the server after the restart does not know this listener id) the listener is not removed from the list eventually. the line this.listenerNotifier.removeClientListener(listenerId); is not executed.