Skip to content

Commit f16cd6b

Browse files
committed
11246:: Addressing the latest review comments
1 parent 26095ef commit f16cd6b

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

core/src/main/java/io/grpc/internal/ServerCallImpl.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ private void messagesAvailableInternal(final MessageProducer producer) {
331331
InputStream message;
332332
while ((message = producer.next()) != null) {
333333
ReqT parsedMessage;
334-
try {
334+
try (InputStream ignored = message) {
335335
parsedMessage = call.method.parseRequest(message);
336336
} catch (StatusRuntimeException e) {
337337
GrpcUtil.closeQuietly(message);
@@ -340,13 +340,7 @@ private void messagesAvailableInternal(final MessageProducer producer) {
340340
call.close(e.getStatus(), new Metadata());
341341
return;
342342
}
343-
try {
344-
listener.onMessage(parsedMessage);
345-
} catch (Throwable t) {
346-
GrpcUtil.closeQuietly(message);
347-
message.close();
348-
throw t;
349-
}
343+
listener.onMessage(parsedMessage);
350344
}
351345
} catch (Throwable t) {
352346
GrpcUtil.closeQuietly(producer);

core/src/test/java/io/grpc/internal/ServerCallImplTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,6 @@ public Long parse(InputStream stream) {
531531

532532
streamListener.halfClosed();
533533
verify(callListener, never()).onHalfClose();
534-
verify(message).close();
535534
verify(callListener,never()).onMessage(any());
536535
}
537536

0 commit comments

Comments
 (0)