From 5ff16dd4c6815c7e162a7a6f6bb2edf485047bc4 Mon Sep 17 00:00:00 2001 From: Kenji Kaneda Date: Wed, 30 Nov 2016 16:03:21 -0800 Subject: [PATCH] core: Make tiny fixes to InUseStateAggregator2 and InternalSubchannel (#2466) - Remove unused variable terminated from TransportListener#transportTerminated - Do not mention getLock in the javadoc of InUseStateAggregator2#handleNotInUse --- core/src/main/java/io/grpc/internal/InUseStateAggregator2.java | 2 -- core/src/main/java/io/grpc/internal/InternalSubchannel.java | 1 - 2 files changed, 3 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/InUseStateAggregator2.java b/core/src/main/java/io/grpc/internal/InUseStateAggregator2.java index a303b60b05..3cf319b979 100644 --- a/core/src/main/java/io/grpc/internal/InUseStateAggregator2.java +++ b/core/src/main/java/io/grpc/internal/InUseStateAggregator2.java @@ -75,8 +75,6 @@ abstract class InUseStateAggregator2 { /** * Called when the aggregated in-use state has changed to false, which means no object is in use. - * - *

This method is called under the lock returned by {@link #getLock}. */ abstract void handleNotInUse(); } diff --git a/core/src/main/java/io/grpc/internal/InternalSubchannel.java b/core/src/main/java/io/grpc/internal/InternalSubchannel.java index c044bb9376..13b5c8d924 100644 --- a/core/src/main/java/io/grpc/internal/InternalSubchannel.java +++ b/core/src/main/java/io/grpc/internal/InternalSubchannel.java @@ -447,7 +447,6 @@ final class InternalSubchannel implements WithLogId { log.log(Level.FINE, "[{0}] {1} for {2} is terminated", new Object[] {getLogId(), transport.getLogId(), address}); } - boolean terminated = false; handleTransportInUseState(transport, false); synchronized (lock) { transports.remove(transport);