ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix NPEs in MFCs ServerConfig

This commit is contained in:
0xb00bface 2020-07-26 15:14:22 +02:00
parent 787d4301be
commit d63c98cf36
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/ctbrec/sites/mfc/ServerConfig.java
View File

@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import org.json.JSONArray;
@ -75,7 +74,7 @@ public class ServerConfig {
}
public boolean isOnHtml5VideoServer(SessionState state) {
int camserv = Objects.requireNonNull(Objects.requireNonNull(state.getU()).getCamserv());
int camserv = getCamServ(state);
return isOnObsServer(state)
|| h5Servers.containsKey(Integer.toString(camserv))
|| (camserv >= 904 && camserv <= 915
@ -87,12 +86,17 @@ public class ServerConfig {
}
public boolean isOnWzObsVideoServer(SessionState state) {
int camserv = Optional.ofNullable(state).map(SessionState::getU).map(User::getCamserv).orElse(-1);
int camserv = getCamServ(state);
return wzobsServers.containsKey(Integer.toString(camserv));
}
public boolean isOnNgServer(SessionState state) {
int camserv = Objects.requireNonNull(Objects.requireNonNull(state.getU()).getCamserv());
int camserv = getCamServ(state);
return ngVideoServers.containsKey(Integer.toString(camserv));
}
private static int getCamServ(SessionState state) {
int camserv = Optional.ofNullable(state).map(SessionState::getU).map(User::getCamserv).orElse(-1);
return camserv;
}
}