Skip to content

Commit 292a361

Browse files
committed
binder,cronet: Handle double-ClientTransportFactory.close()
Netty/OkHttp/InProcess transports all ignore duplicate closes. We might want to change that in the future, but for now let's just get them aligned.
1 parent 7843bd4 commit 292a361

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

‎binder/src/main/java/io/grpc/binder/internal/BinderClientTransportFactory.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ public SwapChannelCredentialsResult swapChannelCredentials(ChannelCredentials ch
101101

102102
@Override
103103
public void close() {
104+
if (closed) {
105+
return;
106+
}
104107
closed = true;
105108
executorService = scheduledExecutorPool.returnObject(executorService);
106109
offloadExecutor = offloadExecutorPool.returnObject(offloadExecutor);

‎cronet/src/main/java/io/grpc/cronet/CronetChannelBuilder.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ static class CronetTransportFactory implements ClientTransportFactory {
246246
private final boolean usingSharedScheduler;
247247
private final boolean useGetForSafeMethods;
248248
private final boolean usePutForIdempotentMethods;
249+
private boolean closed;
249250

250251
private CronetTransportFactory(
251252
StreamBuilderFactory streamFactory,
@@ -271,6 +272,9 @@ private CronetTransportFactory(
271272
@Override
272273
public ConnectionClientTransport newClientTransport(
273274
SocketAddress addr, ClientTransportOptions options, ChannelLogger channelLogger) {
275+
if (closed) {
276+
throw new IllegalStateException("The transport factory is closed.");
277+
}
274278
InetSocketAddress inetSocketAddr = (InetSocketAddress) addr;
275279
return new CronetClientTransport(streamFactory, inetSocketAddr, options.getAuthority(),
276280
options.getUserAgent(), options.getEagAttributes(), executor, maxMessageSize,
@@ -289,6 +293,10 @@ public SwapChannelCredentialsResult swapChannelCredentials(ChannelCredentials ch
289293

290294
@Override
291295
public void close() {
296+
if (closed) {
297+
return;
298+
}
299+
closed = true;
292300
if (usingSharedScheduler) {
293301
SharedResourceHolder.release(GrpcUtil.TIMER_SERVICE, timeoutService);
294302
}

0 commit comments

Comments
 (0)