Skip to content

Commit 1fb0ff2

Browse files
committed
address comments
1 parent 4ba6de4 commit 1fb0ff2

4 files changed

Lines changed: 4 additions & 12 deletions

File tree

cronet/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ dependencies {
5858

5959
task javadocs(type: Javadoc) {
6060
source = android.sourceSets.main.java.srcDirs
61-
// classpath += files(android.getBootClasspath())
61+
classpath += files(android.getBootClasspath())
6262
classpath += files({
6363
android.libraryVariants.collect { variant ->
6464
variant.javaCompileProvider.get().classpath

xds/src/main/java/io/grpc/xds/XdsServerWrapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,7 @@ public void onResourceChanged(final StatusOr<LdsUpdate> update) {
417417
}
418418

419419
if (!pendingRds.isEmpty()) {
420+
// filter chain state has not yet been applied to filterChainSelectorManager and there
420421
releaseSuppliersInFlight();
421422
pendingRds.clear();
422423
}

xds/src/main/java/io/grpc/xds/client/XdsClient.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ public interface ResourceWatcher<T extends ResourceUpdate> {
161161
/**
162162
* Called to deliver a transient error that should not affect the watcher's use of any
163163
* previously received resource.
164-
*
165-
* <p>Note that we expect that the implementer to:
166-
* - Comply with the guarantee to not generate certain statuses by the library:
167-
* https://grpc.github.io/grpc/core/md_doc_statuscodes.html. If the code needs to be
168-
* propagated to the channel, override it with {@link io.grpc.Status.Code#UNAVAILABLE}.
169-
* - Keep {@link Status} description in one form or another, as it contains valuable debugging
170-
* information.
171164
* */
172165
void onAmbientError(Status error);
173166
}

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -841,11 +841,9 @@ void onData(ParsedResource<T> parsedResource, String version, long updateTime,
841841
}
842842
if (!Objects.equals(oldData, data)) {
843843
StatusOr<T> update = StatusOr.fromValue(data);
844-
for (Map.Entry<ResourceWatcher<T>, Executor> entry : watchers.entrySet()) {
845-
ResourceWatcher<T> watcher = entry.getKey();
846-
Executor executor = entry.getValue();
844+
for (ResourceWatcher<T> watcher : watchers.keySet()) {
847845
processingTracker.startTask();
848-
executor.execute(() -> {
846+
watchers.get(watcher).execute(() -> {
849847
try {
850848
watcher.onResourceChanged(update);
851849
} finally {

0 commit comments

Comments
 (0)