From cf638997f63980a70909b6156cb07901f792b96b Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Wed, 25 Sep 2024 15:30:27 +0800
Subject: [PATCH] protobuf

---
 .../java/org/redkale/convert/pb/ProtobufConvert.java     | 6 +++---
 src/main/java/org/redkale/convert/pb/ProtobufWriter.java | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/redkale/convert/pb/ProtobufConvert.java b/src/main/java/org/redkale/convert/pb/ProtobufConvert.java
index 1f427f60d..51ef1f959 100644
--- a/src/main/java/org/redkale/convert/pb/ProtobufConvert.java
+++ b/src/main/java/org/redkale/convert/pb/ProtobufConvert.java
@@ -685,13 +685,13 @@ public class ProtobufConvert extends BinaryConvert<ProtobufReader, ProtobufWrite
         if (encoder == null || encoder.getType() != t) {
             encoder = factory.loadEncoder(t);
             this.lastEncodeable = encoder;
+            if (!(encoder instanceof ObjectEncoder) && !(encoder instanceof SimpledCoder)) {
+                throw new ConvertException(this.getClass().getSimpleName() + " not supported type(" + t + ")");
+            }
         }
         if (encoder.specifyable()) {
             writer.specificObjectType(t);
         }
-        if (!(encoder instanceof ObjectEncoder) && !(encoder instanceof SimpledCoder)) {
-            throw new ConvertException(this.getClass().getSimpleName() + " not supported type(" + t + ")");
-        }
         encoder.convertTo(writer, value);
         byte[] result = writer.toArray();
         offerWriter(writer);
diff --git a/src/main/java/org/redkale/convert/pb/ProtobufWriter.java b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java
index 3dcb3be8e..23f3fcc91 100644
--- a/src/main/java/org/redkale/convert/pb/ProtobufWriter.java
+++ b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java
@@ -207,12 +207,9 @@ public class ProtobufWriter extends Writer implements ByteTuple {
 
     @Override
     public byte[] toArray() {
-        if (count == content.length) {
-            return content;
-        }
-        byte[] newdata = new byte[count];
-        System.arraycopy(content, 0, newdata, 0, count);
-        return newdata;
+        byte[] copy = new byte[count];
+        System.arraycopy(content, 0, copy, 0, count);
+        return copy;
     }
 
     public ProtobufWriter enumtostring(boolean enumtostring) {