mirror of https://github.com/grpc/grpc-java.git
Revert "core: ForwardingLoadBalancer to forward acceptResolvedAddresses() (#10050)"
This reverts commit 086edf0f20.
This commit is contained in:
parent
086edf0f20
commit
f2b976266e
|
|
@ -34,11 +34,6 @@ public abstract class ForwardingLoadBalancer extends LoadBalancer {
|
||||||
delegate().handleResolvedAddresses(resolvedAddresses);
|
delegate().handleResolvedAddresses(resolvedAddresses);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
|
|
||||||
return delegate().acceptResolvedAddresses(resolvedAddresses);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handleNameResolutionError(Status error) {
|
public void handleNameResolutionError(Status error) {
|
||||||
delegate().handleNameResolutionError(error);
|
delegate().handleNameResolutionError(error);
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,7 @@ import static org.mockito.Mockito.mock;
|
||||||
|
|
||||||
import io.grpc.ForwardingTestUtil;
|
import io.grpc.ForwardingTestUtil;
|
||||||
import io.grpc.LoadBalancer;
|
import io.grpc.LoadBalancer;
|
||||||
|
import io.grpc.LoadBalancer.ResolvedAddresses;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
|
|
@ -43,6 +44,7 @@ public class ForwardingLoadBalancerTest {
|
||||||
LoadBalancer.class,
|
LoadBalancer.class,
|
||||||
mockDelegate,
|
mockDelegate,
|
||||||
new TestBalancer(),
|
new TestBalancer(),
|
||||||
Arrays.asList());
|
Arrays.asList(
|
||||||
|
LoadBalancer.class.getMethod("acceptResolvedAddresses", ResolvedAddresses.class)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue