Merged msbg array fix.

Fixed #558 for null pointer on startup without habridge.conf
This commit is contained in:
bwssystems
2017-03-18 17:26:25 -05:00
parent 59ef6e88de
commit 1a402e425e
2 changed files with 8 additions and 5 deletions

View File

@@ -435,11 +435,14 @@ public class BridgeSettingsDescriptor {
public void setupInternalTestUser() {
boolean found = false;
for (String key : whitelist.keySet()) {
if(key.equals(DEFAULT_INTERNAL_USER))
found = true;
if(whitelist != null) {
for (String key : whitelist.keySet()) {
if(key.equals(DEFAULT_INTERNAL_USER)) {
found = true;
break;
}
}
}
if(!found) {
newWhitelistUser(DEFAULT_INTERNAL_USER, DEFAULT_USER_DESCRIPTION);
}