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

skip to invoke register if value is null

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-01-05 06:12:19 +09:00
parent e18480b664
commit a5d6e51772
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
View file

@ -183,7 +183,7 @@ public class AdminSchedulerAction extends FessAdminAction {
verifyCrudMode(crudMode, CrudMode.DETAILS);
saveToken();
return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp).renderWith(data -> {
data.register("systemJobId", fessConfig.isSystemJobId(id));
RenderDataUtil.register(data, "systemJobId", fessConfig.isSystemJobId(id));
}).useForm(EditForm.class, op -> {
op.setup(form -> {
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
@ -369,7 +369,7 @@ public class AdminSchedulerAction extends FessAdminAction {
private HtmlResponse asDetailsHtml(String id) {
return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp).renderWith(data -> {
data.register("systemJobId", fessConfig.isSystemJobId(id));
RenderDataUtil.register(data, "systemJobId", fessConfig.isSystemJobId(id));
});
}
}

4
src/main/java/org/codelibs/fess/util/RenderDataUtil.java
View file

@ -26,7 +26,9 @@ import org.lastaflute.web.response.render.RenderData;
public class RenderDataUtil {
public static void register(final RenderData data, final String key, final Object value) {
if (value instanceof Entity) {
if (value == null) {
return;
} else if (value instanceof Entity) {
data.register(key, BeanUtil.copyBeanToNewMap(value));
} else if (value instanceof Collection<?>) {
final Collection<?> coll = ((Collection<?>) value);