pb

src/main/java/org/redkale/convert/pb/ProtobufBytesWriter.java

@@ -23,6 +23,10 @@ public class ProtobufBytesWriter extends ProtobufWriter { // 存在child情况
 
     byte[] content;
 
+    ProtobufBytesWriter child;
+
+    private ProtobufBytesWriter parent;
+
     // 链表结构
     private ProtobufBytesWriter delegate;
 
@@ -54,14 +58,16 @@ public class ProtobufBytesWriter extends ProtobufWriter { // 存在child情况
     protected boolean recycle() {
         super.recycle();
         if (this.delegate != null && this.pool != null && this.parent == null) {
-            ProtobufWriter s;
+            ProtobufBytesWriter s;
-            ProtobufWriter p = this.delegate;
+            ProtobufBytesWriter p = this.delegate;
             do {
                 s = p;
                 p = p.parent;
                 offerPool(s);
             } while (p != this);
         }
+        this.child = null;
+        this.parent = null;
         this.delegate = null;
         if (this.content.length > RESET_MAX_SIZE) {
             this.content = new byte[DEFAULT_SIZE];
@@ -69,10 +75,10 @@ public class ProtobufBytesWriter extends ProtobufWriter { // 存在child情况
         return true;
     }
 
-    private void offerPool(ProtobufWriter item) {
+    private void offerPool(ProtobufBytesWriter item) {
         if (this.pool != null && this.pool.size() < CHILD_SIZE) {
             item.recycle();
-            this.pool.offer((ProtobufBytesWriter) item);
+            this.pool.offer(item);
         }
     }
 
@@ -83,9 +89,9 @@ public class ProtobufBytesWriter extends ProtobufWriter { // 存在child情况
             // 必须要使用根节点的pool
             ProtobufBytesWriter root = null;
             if (this.parent != null) {
-                ProtobufWriter p = this;
+                ProtobufBytesWriter p = this;
-                while ((p = p.parent) instanceof ProtobufBytesWriter) {
+                while ((p = p.parent) != null) {
-                    root = (ProtobufBytesWriter) p;
+                    root = p;
                 }
             }
             if (root != null) {
@@ -114,9 +120,9 @@ public class ProtobufBytesWriter extends ProtobufWriter { // 存在child情况
             delegate = result;
         }
         if (this.parent != null) {
-            ProtobufWriter p = this;
+            ProtobufBytesWriter p = this;
-            while ((p = p.parent) instanceof ProtobufBytesWriter) {
+            while ((p = p.parent) != null) {
-                ((ProtobufBytesWriter) p).delegate = result;
+                p.delegate = result;
             }
         }
         result.configFieldFunc(result.parent);
@@ -125,13 +131,14 @@ public class ProtobufBytesWriter extends ProtobufWriter { // 存在child情况
 
     @Override
     public void offerChild(ProtobufWriter child) {
-        if (child != null) {
+        ProtobufBytesWriter sub = (ProtobufBytesWriter) child;
-            int len = child.length();
+        if (sub != null) {
-            ProtobufWriter next = child;
+            int len = sub.length();
+            ProtobufBytesWriter next = sub;
             while ((next = next.child) != null) {
                 len += next.length();
             }
-            child.parent.writeSelfLength(len);
+            sub.parent.writeSelfLength(len);
         }
     }
 

src/main/java/org/redkale/convert/pb/ProtobufWriter.java

@@ -66,9 +66,6 @@ public abstract class ProtobufWriter extends Writer {
 
     protected boolean enumtostring;
 
-    protected ProtobufWriter parent;
-
-    protected ProtobufBytesWriter child;
 
     protected Map<Stream, Object[]> streamArrayCache;
 
@@ -113,8 +110,6 @@ public abstract class ProtobufWriter extends Writer {
     @Override
     protected boolean recycle() {
         super.recycle();
-        this.child = null;
-        this.parent = null;
         this.mapFieldFunc = null;
         this.objFieldFunc = null;
         this.objExtFunc = null;