diff --git a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java index 45f7c17a6..c6cffce7f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java @@ -218,6 +218,10 @@ public class AdminBackupAction extends FessAdminAction { addToList(entity.getQueryTime(), list); addToList(entity.getResponseTime(), list); addToList(entity.getRequestedAt(), list); + entity.getSearchFieldLogList().stream().forEach(e -> { + addToList(e.getFirst(), list); + addToList(e.getSecond(), list); + }); try { writer.writeValues(list); } catch (final IOException e) { diff --git a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java index 5694e77d8..dacf45ebe 100644 --- a/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java +++ b/src/main/java/org/codelibs/fess/es/log/exbhv/SearchLogBhv.java @@ -59,14 +59,14 @@ public class SearchLogBhv extends BsSearchLogBhv { @Override protected RESULT createEntity(final Map source, final Class entityType) { try { - final RESULT result = entityType.newInstance(); + final RESULT result = super.createEntity(source, entityType); final Object searchFieldObj = source.get("searchField"); if (searchFieldObj instanceof Map) { ((Map) searchFieldObj).entrySet().stream() .forEach(e -> result.getSearchFieldLogList().add(new Pair(e.getKey(), e.getValue()))); } return result; - } catch (InstantiationException | IllegalAccessException e) { + } catch (Exception e) { final String msg = "Cannot create a new instance: " + entityType.getName(); throw new IllegalBehaviorStateException(msg, e); }