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

fix #1454 replace with CloseableUtil

Browse source
This commit is contained in:
Shinsuke Sugaya 2018-01-21 22:42:00 +09:00
parent 9f594b92d4
commit 7054d4a40f
11 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -1230,7 +1230,7 @@
<dependency>
<groupId>org.codelibs</groupId>
<artifactId>corelib</artifactId>
<version>0.3.6</version>
<version>0.3.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.codelibs</groupId>

4
src/main/java/org/codelibs/fess/crawler/FessCrawlerThread.java
View file

@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.app.service.FailureUrlService;
import org.codelibs.fess.crawler.builder.RequestDataBuilder;
@ -183,7 +183,7 @@ public class FessCrawlerThread extends CrawlerThread {
}
} finally {
if (responseData != null) {
IOUtils.closeQuietly(responseData);
CloseableUtil.closeQuietly(responseData);
}
}
}

4
src/main/java/org/codelibs/fess/dict/kuromoji/KuromojiFile.java
View file

@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.dict.DictionaryException;
@ -276,7 +276,7 @@ public class KuromojiFile extends DictionaryFile<KuromojiItem> {
} catch (final IOException e) {
// ignore
}
IOUtils.closeQuietly(writer);
CloseableUtil.closeQuietly(writer);
if (isCommit) {
try {

4
src/main/java/org/codelibs/fess/dict/mapping/CharMappingFile.java
View file

@ -33,7 +33,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.dict.DictionaryException;
@ -290,7 +290,7 @@ public class CharMappingFile extends DictionaryFile<CharMappingItem> {
} catch (final IOException e) {
// ignore
}
IOUtils.closeQuietly(writer);
CloseableUtil.closeQuietly(writer);
if (isCommit) {
try {

4
src/main/java/org/codelibs/fess/dict/protwords/ProtwordsFile.java
View file

@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.dict.DictionaryException;
@ -276,7 +276,7 @@ public class ProtwordsFile extends DictionaryFile<ProtwordsItem> {
} catch (final IOException e) {
// ignore
}
IOUtils.closeQuietly(writer);
CloseableUtil.closeQuietly(writer);
if (isCommit) {
try {

4
src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java
View file

@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.dict.DictionaryException;
@ -310,7 +310,7 @@ public class SeunjeonFile extends DictionaryFile<SeunjeonItem> {
} catch (final IOException e) {
// ignore
}
IOUtils.closeQuietly(writer);
CloseableUtil.closeQuietly(writer);
if (isCommit) {
try {

4
src/main/java/org/codelibs/fess/dict/synonym/SynonymFile.java
View file

@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.dict.DictionaryException;
@ -348,7 +348,7 @@ public class SynonymFile extends DictionaryFile<SynonymItem> {
} catch (final IOException e) {
// ignore
}
IOUtils.closeQuietly(writer);
CloseableUtil.closeQuietly(writer);
if (isCommit) {
try {

4
src/main/java/org/codelibs/fess/ds/impl/CsvDataStoreImpl.java
View file

@ -29,8 +29,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.app.service.FailureUrlService;
@ -288,7 +288,7 @@ public class CsvDataStoreImpl extends AbstractDataStoreImpl {
} catch (final Exception e) {
throw new DataStoreException("Failed to crawl data when reading csv file.", e);
} finally {
IOUtils.closeQuietly(csvReader);
CloseableUtil.closeQuietly(csvReader);
}
}

7
src/main/java/org/codelibs/fess/helper/ProcessHelper.java
View file

@ -27,6 +27,7 @@ import java.util.function.Consumer;
import javax.annotation.PreDestroy;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.fess.Constants;
import org.codelibs.fess.exception.JobNotFoundException;
import org.codelibs.fess.exception.JobProcessingException;
@ -97,7 +98,7 @@ public class ProcessHelper {
final Process process = jobProcess.getProcess();
new Thread(() -> {
try {
IOUtils.closeQuietly(process.getInputStream());
CloseableUtil.closeQuietly(process.getInputStream());
} catch (final Exception e) {
logger.warn("Could not close a process input stream.", e);
} finally {
@ -106,7 +107,7 @@ public class ProcessHelper {
}, "ProcessCloser-input-" + sessionId).start();
new Thread(() -> {
try {
IOUtils.closeQuietly(process.getErrorStream());
CloseableUtil.closeQuietly(process.getErrorStream());
} catch (final Exception e) {
logger.warn("Could not close a process error stream.", e);
} finally {
@ -115,7 +116,7 @@ public class ProcessHelper {
}, "ProcessCloser-error-" + sessionId).start();
new Thread(() -> {
try {
IOUtils.closeQuietly(process.getOutputStream());
CloseableUtil.closeQuietly(process.getOutputStream());
} catch (final Exception e) {
logger.warn("Could not close a process output stream.", e);
} finally {

6
src/main/java/org/codelibs/fess/helper/ViewHelper.java
View file

@ -41,10 +41,10 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.connector.ClientAbortException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.codelibs.core.CoreLibConstants;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
@ -535,7 +535,7 @@ public class ViewHelper {
final ResponseData responseData = client.execute(RequestDataBuilder.newRequestData().get().url(url).build());
if (responseData.getHttpStatusCode() == 404) {
response.httpStatus(responseData.getHttpStatusCode());
IOUtils.closeQuietly(responseData);
CloseableUtil.closeQuietly(responseData);
return response;
}
writeFileName(response, responseData);
@ -549,7 +549,7 @@ public class ViewHelper {
throw new FessSystemException("Failed to write a content. configId: " + configId + ", url: " + url, e);
}
} finally {
IOUtils.closeQuietly(responseData);
CloseableUtil.closeQuietly(responseData);
}
if (logger.isDebugEnabled()) {
logger.debug("Finished to write " + url);

4
src/main/java/org/codelibs/fess/thumbnail/impl/CommandGenerator.java
View file

@ -28,7 +28,7 @@ import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.ServletContext;
import org.apache.commons.io.IOUtils;
import org.codelibs.core.io.CloseableUtil;
import org.codelibs.core.io.CopyUtil;
import org.codelibs.core.lang.StringUtil;
import org.slf4j.Logger;
@ -155,7 +155,7 @@ public class CommandGenerator extends BaseThumbnailGenerator {
}
}
} finally {
IOUtils.closeQuietly(br);
CloseableUtil.closeQuietly(br);
}
p.waitFor();