Skip to content

Commit 5f6660e

Browse files
authored
Merge pull request #4349 from forfreeday/HotFix/print_unknownfield
feat: update version
2 parents 3a06666 + a75e12a commit 5f6660e

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

framework/src/main/java/org/tron/core/services/http/JsonFormat.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,12 @@ protected static void print(Message message, JsonGenerator generator, boolean se
147147
generator.print(",");
148148
}
149149
}
150-
if (message.getUnknownFields().asMap().size() > 0) {
151-
generator.print(", ");
152-
}
153-
printUnknownFields(message.getUnknownFields(), generator, selfType);
150+
151+
// do not print unknown fields
152+
// if (message.getUnknownFields().asMap().size() > 0) {
153+
// generator.print(", ");
154+
// }
155+
// printUnknownFields(message.getUnknownFields(), generator, selfType);
154156
}
155157

156158
/**
@@ -421,15 +423,19 @@ protected static void printUnknownFields(UnknownFieldSet unknownFields, JsonGene
421423
} else {
422424
generator.print(", ");
423425
}
426+
generator.print("\"");
424427
generator.print(String.format((Locale) null, "0x%08x", value));
428+
generator.print("\"");
425429
}
426430
for (long value : field.getFixed64List()) {
427431
if (firstValue) {
428432
firstValue = false;
429433
} else {
430434
generator.print(", ");
431435
}
436+
generator.print("\"");
432437
generator.print(String.format((Locale) null, "0x%016x", value));
438+
generator.print("\"");
433439
}
434440
for (ByteString value : field.getLengthDelimitedList()) {
435441
if (firstValue) {

framework/src/main/java/org/tron/program/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class Version {
44

55
public static final String VERSION_NAME = "GreatVoyage-v4.4.2-94-g38dfe231c";
66
public static final String VERSION_CODE = "16676";
7-
private static final String VERSION = "4.4.4";
7+
private static final String VERSION = "4.4.5";
88

99
public static String getVersion() {
1010
return VERSION;

0 commit comments

Comments
 (0)