mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-05 20:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3496 from actiontech/issue/3450

Browse Source 
[inner-2021] support the JDK parameters
This commit is contained in:
LUA
2022-11-30 17:47:04 +08:00
committed by GitHub
parent 180a0d31f7 9f32058ffd
commit 520a21c6ef
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/actiontech/dble/config/loader/SystemConfigLoader.java
View File

@@ -136,7 +136,8 @@ public final class SystemConfigLoader {
Set<String> propItem = new HashSet<>();
for (Object key : system.keySet()) {
String strKey = (String) key;
if (!SystemProperty.getInnerProperties().contains(strKey)) {
if (!SystemProperty.getInnerProperties().contains(strKey) &&
!SystemProperty.isJavaInnerProperties(strKey)) {
propItem.add(strKey);
}
}

11
src/main/java/com/actiontech/dble/util/SystemProperty.java
View File

@@ -7,6 +7,8 @@ package com.actiontech.dble.util;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public final class SystemProperty {
private SystemProperty() {
@@ -18,6 +20,7 @@ public final class SystemProperty {
}
private static Set<String> innerProperties = new HashSet<>();
private static final Pattern JAVA_INNER_PROPERTIES_PATTERN = Pattern.compile("^java.[a-zA-Z_0-9]+(.)*$");
static {
innerProperties.add("awt.toolkit");
@@ -38,6 +41,7 @@ public final class SystemProperty {
innerProperties.add("java.specification.name");
innerProperties.add("java.specification.vendor");
innerProperties.add("java.specification.version");
innerProperties.add("java.specification.maintenance.version"); // see https://github.com/actiontech/dble/issues/3450
innerProperties.add("java.vendor");
innerProperties.add("java.vendor.url");
innerProperties.add("java.vendor.url.bug");
@@ -83,4 +87,11 @@ public final class SystemProperty {
innerProperties.add("user.country.format");
innerProperties.add("javax.net.debug");
}
public static boolean isJavaInnerProperties(String key) {
Matcher m = JAVA_INNER_PROPERTIES_PATTERN.matcher(key);
if (m.matches())
return true;
return false;
}
}