From 03f83bbac25b08ff89d435428101143d0a17d000 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Mon, 24 Aug 2020 07:26:21 -0700 Subject: [PATCH] api: Fix NameResolver.ConfigOrError javadoc It appears getAttributes() javadoc was accidentally copied when ConfigOrError was moved in commit 0244418d2. This restores the documentation from before the move. --- api/src/main/java/io/grpc/NameResolver.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/io/grpc/NameResolver.java b/api/src/main/java/io/grpc/NameResolver.java index 8d4b6472e0f..eb70eae31fd 100644 --- a/api/src/main/java/io/grpc/NameResolver.java +++ b/api/src/main/java/io/grpc/NameResolver.java @@ -842,12 +842,12 @@ public ResolutionResult build() { } } } - + /** - * Gets the attributes associated with the addresses resolved by name resolution. If there are - * no attributes, {@link Attributes#EMPTY} will be returned. + * Represents either a successfully parsed service config, containing all necessary parts to be + * later applied by the channel, or a Status containing the error encountered while parsing. * - * @since 1.21.0 + * @since 1.20.0 */ @ExperimentalApi("https://github.com/grpc/grpc-java/issues/1770") public static final class ConfigOrError {