From fb09bba45684471768de1ab46ed3bac09b9c59c5 Mon Sep 17 00:00:00 2001 From: ejona Date: Wed, 3 Dec 2014 12:55:39 -0800 Subject: [PATCH] Don't leak decompressor in gRPC v2. We don't use the decompressor at all in gRPC v2, but it may still have resources that should be close()d. ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=81271990 --- .../net/stubby/transport/AbstractStream.java | 3 +++ lib/libtest_proto_grpc.jar | Bin 17139 -> 17140 bytes 2 files changed, 3 insertions(+) diff --git a/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java index 6e3bf7773d..4083a52ba9 100644 --- a/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java +++ b/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java @@ -104,6 +104,9 @@ public abstract class AbstractStream implements Stream { new GrpcDeframer(decompressor, inboundMessageHandler, deframerExecutor, listener); this.deframer2 = null; } else { + if (decompressor != null) { + decompressor.close(); + } framer = new MessageFramer2(outboundFrameHandler, 4096); this.deframer = null; this.deframer2 = new MessageDeframer2(inboundMessageHandler, deframerExecutor, listener); diff --git a/lib/libtest_proto_grpc.jar b/lib/libtest_proto_grpc.jar index 9b1c90652f127208299a69a9876724a7b0387745..ebc760f8b369dd1be6733a61174ae4843faf8956 100644 GIT binary patch delta 3355 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