fix memory leak

apache · Jun 29, 2022 · 6c12d55 · 6c12d55
1 parent c1a76a0
commit 6c12d55
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 0 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStream.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStream.java
@@ -102,6 +102,10 @@ public void reset() {
 
     @Override
     public void close() throws IOException {
+        this.mData = new byte[0];
+        this.mPosition = 0;
+        this.mLimit = 0;
+        this.mMark = 0;
     }
 
     public int position() {

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStream.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStream.java
@@ -97,5 +97,7 @@ public String toString(String charset) throws UnsupportedEncodingException {
 
     @Override
     public void close() throws IOException {
+        this.mBuffer = new byte[0];
+        this.mCount = 0;
     }
 }
diff --git a/...essian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java b/...essian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java
@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.common.serialize.hessian2;
 
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.serialize.Cleanable;
 import org.apache.dubbo.common.serialize.ObjectInput;
 import org.apache.dubbo.common.serialize.hessian2.dubbo.Hessian2FactoryInitializer;
@@ -31,6 +33,8 @@
  */
 public class Hessian2ObjectInput implements ObjectInput, Cleanable {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Hessian2ObjectInput.class);
+
     private static ThreadLocal<Hessian2Input> INPUT_TL = ThreadLocal.withInitial(() -> {
         Hessian2Input h2i = new Hessian2Input(null);
         h2i.setSerializerFactory(Hessian2FactoryInitializer.getInstance().getSerializerFactory());
@@ -115,6 +119,11 @@ public InputStream readInputStream() throws IOException {
     public void cleanup() {
         if(mH2i != null) {
             mH2i.reset();
+            try {
+                mH2i.close();
+            } catch (IOException e) {
+                LOGGER.error(e.getMessage(), e);
+            }
         }
     }
 }
diff --git a/...ssian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java b/...ssian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java
@@ -16,6 +16,8 @@
  */
 package org.apache.dubbo.common.serialize.hessian2;
 
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
 import org.apache.dubbo.common.serialize.Cleanable;
 import org.apache.dubbo.common.serialize.ObjectOutput;
 import org.apache.dubbo.common.serialize.hessian2.dubbo.Hessian2FactoryInitializer;
@@ -30,6 +32,8 @@
  */
 public class Hessian2ObjectOutput implements ObjectOutput, Cleanable {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Hessian2ObjectOutput.class);
+
     private static ThreadLocal<Hessian2Output> OUTPUT_TL = ThreadLocal.withInitial(() -> {
         Hessian2Output h2o = new Hessian2Output(null);
         h2o.setSerializerFactory(Hessian2FactoryInitializer.getInstance().getSerializerFactory());
@@ -112,6 +116,11 @@ public OutputStream getOutputStream() throws IOException {
     public void cleanup() {
         if(mH2o != null) {
             mH2o.reset();
+            try {
+                mH2o.close();
+            } catch (IOException e) {
+                LOGGER.error(e.getMessage(), e);
+            }
         }
     }
 }