0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add null/empty check

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-12-24 11:22:57 +09:00
parent d90337202a
commit f4819bce47
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/codelibs/fess/es/config/exentity/DataConfig.java
View file

@ -160,7 +160,7 @@ public class DataConfig extends BsDataConfig implements CrawlingConfig {
roleIdList.add(mapping.getRoleTypeId());
}
final RoleTypeBhv roleTypeBhv = ComponentUtil.getComponent(RoleTypeBhv.class);
roleTypeList = roleTypeBhv.selectList(cb -> {
roleTypeList = roleIdList.isEmpty() ? Collections.emptyList() : roleTypeBhv.selectList(cb -> {
cb.query().setId_InScope(roleIdList);
cb.query().addOrderBy_SortOrder_Asc();
});

4
src/main/java/org/codelibs/fess/es/config/exentity/FileConfig.java
View file

@ -135,7 +135,7 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig {
roleIdList.add(mapping.getRoleTypeId());
}
final RoleTypeBhv roleTypeBhv = ComponentUtil.getComponent(RoleTypeBhv.class);
roleTypeList = roleTypeBhv.selectList(cb -> {
roleTypeList = roleIdList.isEmpty() ? Collections.emptyList() : roleTypeBhv.selectList(cb -> {
cb.query().setId_InScope(roleIdList);
cb.query().addOrderBy_SortOrder_Asc();
});
@ -265,7 +265,7 @@ public class FileConfig extends BsFileConfig implements CrawlingConfig {
final String domain = map.get("domain");
smbAuth.setDomain(domain == null ? StringUtil.EMPTY : domain);
smbAuth.setServer(fileAuth.getHostname());
smbAuth.setPort(fileAuth.getPort());
smbAuth.setPort(fileAuth.getPort() == null ? -1 : fileAuth.getPort().intValue());
smbAuth.setUsername(fileAuth.getUsername());
smbAuth.setPassword(fileAuth.getPassword());
smbAuthList.add(smbAuth);