[dubbo] branch 3.0 updated: fix UnsafeStringWriter constructor (#9353)

[crazyhzm]

This is an automated email from the ASF dual-hosted git repository.

crazyhzm pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.0 by this push:
     new 3b0038b  fix UnsafeStringWriter constructor (#9353)
3b0038b is described below

commit 3b0038ba85510784f9ad1f2eece0c6257ba5e10f
Author: huazhongming <crazy...@gmail.com>
AuthorDate: Mon Dec 6 10:16:10 2021 +0800

    fix UnsafeStringWriter constructor (#9353)
---
 .../java/org/apache/dubbo/common/io/StreamUtils.java     |  4 +++-
 .../dubbo/common/io/UnsafeByteArrayOutputStream.java     | 16 ++++++++--------
 .../org/apache/dubbo/common/io/UnsafeStringWriter.java   |  4 ++--
 .../apache/dubbo/common/io/UnsafeStringWriterTest.java   |  4 +---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
index ab2836e..f3a212a 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java
@@ -28,7 +28,9 @@ public class StreamUtils {
 
     public static InputStream limitedInputStream(final InputStream is, final 
int limit) throws IOException {
         return new InputStream() {
-            private int mPosition = 0, mMark = 0, mLimit = Math.min(limit, 
is.available());
+            private int mPosition = 0;
+            private int mMark = 0;
+            private final int mLimit = Math.min(limit, is.available());
 
             @Override
             public int read() throws IOException {
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
index 6e75eb8..8104eca 100644
--- 
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
@@ -42,12 +42,12 @@ public class UnsafeByteArrayOutputStream extends 
OutputStream {
 
     @Override
     public void write(int b) {
-        int newcount = mCount + 1;
-        if (newcount > mBuffer.length) {
-            mBuffer = Bytes.copyOf(mBuffer, Math.max(mBuffer.length << 1, 
newcount));
+        int newCount = mCount + 1;
+        if (newCount > mBuffer.length) {
+            mBuffer = Bytes.copyOf(mBuffer, Math.max(mBuffer.length << 1, 
newCount));
         }
         mBuffer[mCount] = (byte) b;
-        mCount = newcount;
+        mCount = newCount;
     }
 
     @Override
@@ -58,12 +58,12 @@ public class UnsafeByteArrayOutputStream extends 
OutputStream {
         if (len == 0) {
             return;
         }
-        int newcount = mCount + len;
-        if (newcount > mBuffer.length) {
-            mBuffer = Bytes.copyOf(mBuffer, Math.max(mBuffer.length << 1, 
newcount));
+        int newCount = mCount + len;
+        if (newCount > mBuffer.length) {
+            mBuffer = Bytes.copyOf(mBuffer, Math.max(mBuffer.length << 1, 
newCount));
         }
         System.arraycopy(b, off, mBuffer, mCount, len);
-        mCount = newcount;
+        mCount = newCount;
     }
 
     public int size() {
diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java 
b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
index 815123a..4ee8a75 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java
@@ -23,7 +23,7 @@ import java.io.Writer;
  * Thread-unsafe StringWriter.
  */
 public class UnsafeStringWriter extends Writer {
-    private StringBuilder mBuffer;
+    private final StringBuilder mBuffer;
 
     public UnsafeStringWriter() {
         lock = mBuffer = new StringBuilder();
@@ -34,7 +34,7 @@ public class UnsafeStringWriter extends Writer {
             throw new IllegalArgumentException("Negative buffer size");
         }
 
-        lock = mBuffer = new StringBuilder();
+        lock = mBuffer = new StringBuilder(size);
     }
 
     @Override
diff --git 
a/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java
 
b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java
index f487441..dbe8d5c 100644
--- 
a/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java
+++ 
b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java
@@ -39,9 +39,7 @@ public class UnsafeStringWriterTest {
 
     @Test
     public void testNegativeSize() {
-        Assertions.assertThrows(IllegalArgumentException.class, () -> {
-            new UnsafeStringWriter(-1);
-        });
+        Assertions.assertThrows(IllegalArgumentException.class, () -> new 
UnsafeStringWriter(-1));
     }
 
     @Test