Fix InterruptedExceptionSwallowed ErrorProne warning in ByteStreamServer PiperOrigin-RevId: 969819978 Change-Id: I0ef8a3ad1b71300017d3c4ce9b71512a75e729e1
diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java index 2150b6c..093d611 100644 --- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java +++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ByteStreamServer.java
@@ -117,6 +117,10 @@ responseObserver.onCompleted(); } catch (CacheNotFoundException e) { responseObserver.onError(StatusUtils.notFoundError(digest)); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + logger.atWarning().withCause(e).log("Read request interrupted"); + responseObserver.onError(StatusUtils.interruptedError(digest)); } catch (Exception e) { logger.atWarning().withCause(e).log("Read request failed"); responseObserver.onError(StatusUtils.internalError(e)); @@ -277,6 +281,11 @@ responseObserver.onNext(WriteResponse.newBuilder().setCommittedSize(offset).build()); responseObserver.onCompleted(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + logger.atWarning().withCause(e).log("Write request interrupted"); + responseObserver.onError(StatusUtils.interruptedError(digest)); + closed = true; } catch (Exception e) { logger.atWarning().withCause(e).log("Write request failed"); responseObserver.onError(StatusUtils.internalError(e));