Merge pull request #485 from tronprotocol/release_4.4.1

Release 4.4.1
tronprotocol · Apr 26, 2022 · 851ff73 · 851ff73
2 parents 72d951f + df5a3db
commit 851ff73
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/main/java/org/tron/common/utils/JsonFormat.java b/src/main/java/org/tron/common/utils/JsonFormat.java
@@ -103,10 +103,12 @@ protected static void print(Message message, JsonGenerator generator, boolean se
         generator.print(",");
       }
     }
-    if (message.getUnknownFields().asMap().size() > 0) {
-      generator.print(", ");
-    }
-    printUnknownFields(message.getUnknownFields(), generator, selfType);
+
+    // do not print UnknownFields
+    // if (message.getUnknownFields().asMap().size() > 0) {
+    //   generator.print(", ");
+    // }
+    // printUnknownFields(message.getUnknownFields(), generator, selfType);
   }
 
   /**
@@ -320,15 +322,19 @@ protected static void printUnknownFields(UnknownFieldSet unknownFields, JsonGene
         } else {
           generator.print(", ");
         }
+        generator.print("\"");
         generator.print(String.format((Locale) null, "0x%08x", value));
+        generator.print("\"");
       }
       for (long value : field.getFixed64List()) {
         if (firstValue) {
           firstValue = false;
         } else {
           generator.print(", ");
         }
+        generator.print("\"");
         generator.print(String.format((Locale) null, "0x%016x", value));
+        generator.print("\"");
       }
       for (ByteString value : field.getLengthDelimitedList()) {
         if (firstValue) {