Fix review comments.

grpc · Oct 4, 2024 · 70056e4 · 70056e4
1 parent b67a02b
commit 70056e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/api/src/main/java/io/grpc/NameResolver.java b/api/src/main/java/io/grpc/NameResolver.java
@@ -728,7 +728,7 @@ public static final class Builder {
        */
       @Deprecated
       public Builder setAddresses(List<EquivalentAddressGroup> addresses) {
-        this.addresses = StatusOr.fromValue(addresses);
+        setAddressesOrError(StatusOr.fromValue(addresses));
         return this;
       }
 
@@ -738,7 +738,7 @@ public Builder setAddresses(List<EquivalentAddressGroup> addresses) {
        * @param addresses Resolved addresses or an error in resolving addresses
        */
       public Builder setAddressesOrError(StatusOr<List<EquivalentAddressGroup>> addresses) {
-        this.addresses = addresses;
+        this.addresses = checkNotNull(addresses, "StatusOr addresses cannot be null.");
         return this;
       }
 

diff --git a/api/src/main/java/io/grpc/StatusOr.java b/api/src/main/java/io/grpc/StatusOr.java
@@ -61,7 +61,7 @@ public boolean hasValue() {
 
   /** Returns the status. If there is a value (which can be null), returns OK. */
   public Status getStatus() {
-    return status == null? Status.OK : status;
+    return status == null ? Status.OK : status;
   }
 
   @Override

diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java b/core/src/main/java/io/grpc/internal/ManagedChannelImpl.java
@@ -1704,7 +1704,7 @@ public Status onResult2(final ResolutionResult resolutionResult) {
 
       StatusOr<List<EquivalentAddressGroup>> serversOrError =
           resolutionResult.getAddressesOrError();
-      if (serversOrError != null && serversOrError.hasValue()) {
+      if (serversOrError.hasValue()) {
         channelLogger.log(
             ChannelLogLevel.DEBUG,
             "Resolved address: {0}, config={1}",