Skip to content

Commit b6ea27c

Browse files
committed
feat(jvm/JEP-223): use java.specification.version
- use `java.specification.version` instead of parsing `java.version` - ensure consistent version reporting across different Java releases(jdk10+)
1 parent 9aa3383 commit b6ea27c

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

framework/src/main/java/org/tron/core/services/jsonrpc/TronJsonRpcImpl.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.concurrent.ConcurrentHashMap;
2525
import java.util.concurrent.ExecutionException;
2626
import java.util.concurrent.ExecutorService;
27-
import java.util.regex.Matcher;
2827
import java.util.regex.Pattern;
2928
import lombok.Getter;
3029
import lombok.extern.slf4j.Slf4j;
@@ -230,15 +229,11 @@ public static void handleLogsFilter(LogsFilterCapsule logsFilterCapsule) {
230229

231230
@Override
232231
public String web3ClientVersion() {
233-
Pattern shortVersion = Pattern.compile("(\\d\\.\\d).*");
234-
Matcher matcher = shortVersion.matcher(System.getProperty("java.version"));
235-
matcher.matches();
236-
237232
return String.join("/", Arrays.asList(
238233
"TRON",
239234
"v" + Version.getVersion(),
240235
System.getProperty("os.name"),
241-
"Java" + matcher.group(1)));
236+
"Java" + System.getProperty("java.specification.version")));
242237
}
243238

244239
@Override

0 commit comments

Comments
 (0)