nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-11-30 09:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'NullExceptions' into 'dev'

Browse Source 
Fixed Null Exception

See merge request morningstar/Arcturus-Community!277
This commit is contained in:
Harmonic 2020-09-19 13:16:50 -04:00
commit 114794c171
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/eu/habbo/core/ConfigurationManager.java
View File

@ -23,7 +23,7 @@ public class ConfigurationManager {
public boolean loaded = false; public boolean loaded = false;
public boolean isLoading = false; public boolean isLoading = false;
public ConfigurationManager(String configurationPath) throws Exception { public ConfigurationManager(String configurationPath) {
this.properties = new Properties(); this.properties = new Properties();
this.configurationPath = configurationPath; this.configurationPath = configurationPath;
this.reload(); this.reload();
@ -37,7 +37,12 @@ public class ConfigurationManager {
String envDbHostname = System.getenv("DB_HOSTNAME"); String envDbHostname = System.getenv("DB_HOSTNAME");
boolean useEnvVarsForDbConnection = envDbHostname != null && envDbHostname.length() > 1; boolean useEnvVarsForDbConnection = false;
if(envDbHostname != null)
{
useEnvVarsForDbConnection = envDbHostname.length() > 1;
}
if (!useEnvVarsForDbConnection) { if (!useEnvVarsForDbConnection) {
try { try {