From 583df110fd0b0b4950bea38ef366be2c00fd0c3a Mon Sep 17 00:00:00 2001 From: imhao183 Date: Fri, 13 Dec 2019 12:57:59 +0800 Subject: [PATCH] Revert "Fix potential GZIPOutputStream resource leak on exception" This reverts commit 6c7d2ab3ad93248ce9b73598d2693851c2aa01df. --- .../java/io/moquette/spi/impl/Qos1PublishHandler.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java index 5723d466..19806b42 100755 --- a/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java +++ b/broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java @@ -179,15 +179,16 @@ public class Qos1PublishHandler extends QosPublishHandler { MemorySessionStore.Session session = m_sessionStore.getSession(clientID); if (session != null && session.getUsername().equals(fromUser)) { if (data.length > 7*1024 && session.getMqttVersion().protocolLevel() >= MqttVersion.Wildfire_1.protocolLevel()) { - try ( - ByteArrayOutputStream out = new ByteArrayOutputStream(); - GZIPOutputStream gzip = new GZIPOutputStream(out) - ) { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + GZIPOutputStream gzip; + try { + gzip = new GZIPOutputStream(out); gzip.write(data); - data = out.toByteArray(); + gzip.close(); } catch (Exception e) { e.printStackTrace(); } + data = out.toByteArray(); code = (byte)ErrorCode.ERROR_CODE_SUCCESS_GZIPED.code; }