HCOLL-128 cleanup Replicators closeables handling, fixed small defect -- AbstractConnector.connectLater didn't remove channel from closeables

This commit is contained in:
leventov
2014-09-10 03:11:14 +04:00
parent 41a39fe228
commit 2ef875ef91
4 changed files with 113 additions and 68 deletions
@@ -0,0 +1,87 @@
/*
* Copyright 2014 Higher Frequency Trading http://www.higherfrequencytrading.com
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package net.openhft.chronicle.map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.Closeable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
final class CloseablesManager implements Closeable {
private static final Logger LOG = LoggerFactory.getLogger(TcpReplicator.class.getName());
private boolean isClosed = false;
private List<Closeable> closeables = new ArrayList<Closeable>();
private void checkState() {
if (isClosed)
throw new IllegalStateException();
}
public synchronized void add(Closeable closeable) {
checkState();
if (closeable == null)
throw new NullPointerException();
closeables.add(closeable);
}
public synchronized void close(Closeable closeable) throws IOException {
checkState();
for (Iterator<Closeable> iterator = closeables.iterator(); iterator.hasNext(); ) {
if (iterator.next() == closeable)
iterator.remove();
}
closeable.close();
}
public synchronized void closeQuietly(Closeable closeable) {
try {
close(closeable);
} catch (IOException e) {
LOG.error("", e);
}
}
@Override
public synchronized void close() throws IOException {
IOException ex = null;
for (Closeable closeable : closeables) {
try {
closeable.close();
} catch (IOException e) {
LOG.error("", e);
ex = e;
}
}
closeables.clear();
isClosed = true;
if (ex != null)
throw ex;
}
public synchronized void closeQuietly() {
try {
close();
} catch (IOException e) {
// do nothing
}
}
}