diff options
| -rw-r--r-- | core/src/main/java/io/grpc/internal/AbstractServerStream.java | 2 | ||||
| -rw-r--r-- | testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/java/io/grpc/internal/AbstractServerStream.java b/core/src/main/java/io/grpc/internal/AbstractServerStream.java index 7cdb69e97..ec4a8e696 100644 --- a/core/src/main/java/io/grpc/internal/AbstractServerStream.java +++ b/core/src/main/java/io/grpc/internal/AbstractServerStream.java @@ -128,7 +128,6 @@ public abstract class AbstractServerStream extends AbstractStream Preconditions.checkNotNull(trailers, "trailers"); if (!outboundClosed) { outboundClosed = true; - statsTraceCtx.streamClosed(status); endOfMessages(); addStatusToTrailers(trailers, status); // Safe to set without synchronization because access is tightly controlled. @@ -336,6 +335,7 @@ public abstract class AbstractServerStream extends AbstractStream statsTraceCtx.streamClosed(newStatus); getTransportTracer().reportStreamClosed(false); } else { + statsTraceCtx.streamClosed(closedStatus); getTransportTracer().reportStreamClosed(closedStatus.isOk()); } listenerClosed = true; diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java index d69d2d527..5caca3712 100644 --- a/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java +++ b/testing/src/main/java/io/grpc/internal/testing/AbstractTransportTest.java @@ -776,10 +776,10 @@ public abstract class AbstractTransportTest { trailers.put(asciiKey, "dupvalue"); trailers.put(binaryKey, "äbinarytrailers"); serverStream.close(status, trailers); - assertSame(status, serverStreamTracer1.getStatus()); assertNull(serverStreamTracer1.nextInboundEvent()); assertNull(serverStreamTracer1.nextOutboundEvent()); assertCodeEquals(Status.OK, serverStreamListener.status.get(TIMEOUT_MS, TimeUnit.MILLISECONDS)); + assertSame(status, serverStreamTracer1.getStatus()); Status clientStreamStatus = clientStreamListener.status.get(TIMEOUT_MS, TimeUnit.MILLISECONDS); Metadata clientStreamTrailers = clientStreamListener.trailers.get(TIMEOUT_MS, TimeUnit.MILLISECONDS); |