replace usages of onError with closeWithError

Signed-off-by: Sebastian Schepens <[email protected]>

Author: sschepens

server/src/main/java/io/envoyproxy/controlplane/server/DiscoveryServer.java

@@ -228,15 +228,10 @@ public void onNext(DiscoveryRequest request) {
 
       if (defaultTypeUrl.equals(ANY_TYPE_URL)) {
         if (requestTypeUrl.isEmpty()) {
-          synchronized (responseObserver) {
-            if (!isClosing) {
-              isClosing = true;
-              responseObserver.onError(
-                  Status.UNKNOWN
-                      .withDescription(String.format("[%d] type URL is required for ADS", streamId))
-                      .asRuntimeException());
-            }
-          }
+          closeWithError(
+              Status.UNKNOWN
+                  .withDescription(String.format("[%d] type URL is required for ADS", streamId))
+                  .asRuntimeException());
 
           return;
         }
@@ -297,12 +292,7 @@ public void onError(Throwable t) {
 
       try {
         callbacks.forEach(cb -> cb.onStreamCloseWithError(streamId, defaultTypeUrl, t));
-        synchronized (responseObserver) {
-          if (!isClosing) {
-            isClosing = true;
-            responseObserver.onError(Status.fromThrowable(t).asException());
-          }
-        }
+        closeWithError(Status.fromThrowable(t).asException());
       } finally {
         cancel();
       }