lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Application.replaceValue空指针问题

Browse Source
This commit is contained in:
Redkale
2022-12-18 17:39:15 +08:00
parent 664ad9e4aa
commit d57b4715d0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/redkale/boot/Application.java
View File

@@ -255,6 +255,10 @@ public final class Application {
this.configFromCache = "true".equals(config.getValue("[config-from-cache]")); this.configFromCache = "true".equals(config.getValue("[config-from-cache]"));
this.environment = new Environment(this.envProperties); this.environment = new Environment(this.envProperties);
//设置APP_HOME、APP_NAME //设置APP_HOME、APP_NAME
this.name = checkName(config.getValue("name", ""));
this.resourceFactory.register(RESNAME_APP_NAME, name);
System.setProperty(RESNAME_APP_NAME, name);
final File root = new File(System.getProperty(RESNAME_APP_HOME)); final File root = new File(System.getProperty(RESNAME_APP_HOME));
this.resourceFactory.register(RESNAME_APP_TIME, long.class, this.startTime); this.resourceFactory.register(RESNAME_APP_TIME, long.class, this.startTime);
this.resourceFactory.register(RESNAME_APP_HOME, Path.class, root.toPath()); this.resourceFactory.register(RESNAME_APP_HOME, Path.class, root.toPath());
@@ -327,10 +331,6 @@ public final class Application {
this.nodeid = nid; this.nodeid = nid;
this.resourceFactory.register(RESNAME_APP_NODEID, nid); this.resourceFactory.register(RESNAME_APP_NODEID, nid);
System.setProperty(RESNAME_APP_NODEID, "" + nid); System.setProperty(RESNAME_APP_NODEID, "" + nid);
this.name = checkName(config.getValue("name", ""));
this.resourceFactory.register(RESNAME_APP_NAME, name);
System.setProperty(RESNAME_APP_NAME, name);
} }
String localaddr = config.getValue("address", "").trim(); String localaddr = config.getValue("address", "").trim();