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

#2463 null check

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-06-06 10:38:02 +09:00
parent 40bf615fbc
commit e7ebdd1c42
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/codelibs/fess/crawler/processor/FessResponseProcessor.java
View file

@ -30,11 +30,13 @@ import org.codelibs.fess.util.ComponentUtil;
public class FessResponseProcessor extends DefaultResponseProcessor {
private static final Logger logger = LogManager.getLogger(FessResponseProcessor.class);
private IngestFactory ingestFactory;
private IngestFactory ingestFactory = null;
@PostConstruct
public void init() {
ingestFactory = ComponentUtil.getIngestFactory();
if (ComponentUtil.hasIngestFactory()) {
ingestFactory = ComponentUtil.getIngestFactory();
}
}
@Override
@ -43,6 +45,9 @@ public class FessResponseProcessor extends DefaultResponseProcessor {
}
private ResultData ingest(final ResponseData responseData, final ResultData resultData) {
if (ingestFactory == null) {
return resultData;
}
ResultData target = resultData;
for (final Ingester ingester : ingestFactory.getIngesters()) {
try {

6
src/main/java/org/codelibs/fess/ds/callback/IndexUpdateCallbackImpl.java
View file

@ -52,7 +52,7 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
protected int maxDocumentCacheSize;
private IngestFactory ingestFactory;
private IngestFactory ingestFactory = null;
@PostConstruct
public void init() {
@ -61,7 +61,9 @@ public class IndexUpdateCallbackImpl implements IndexUpdateCallback {
}
maxDocumentRequestSize = Long.parseLong(ComponentUtil.getFessConfig().getIndexerDataMaxDocumentRequestSize());
maxDocumentCacheSize = ComponentUtil.getFessConfig().getIndexerDataMaxDocumentCacheSizeAsInteger();
ingestFactory = ComponentUtil.getIngestFactory();
if (ComponentUtil.hasIngestFactory()) {
ingestFactory = ComponentUtil.getIngestFactory();
}
}
/* (non-Javadoc)

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

@ -528,6 +528,10 @@ public final class ComponentUtil {
return SingletonLaContainerFactory.getContainer().hasComponentDef(RELATED_QUERY_HELPER);
}
public static boolean hasIngestFactory() {
return SingletonLaContainerFactory.getContainer().hasComponentDef(INGEST_FACTORY);
}
public static boolean available() {
try {
return SingletonLaContainer.getComponent(SYSTEM_HELPER) != null;