You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/12/01 15:58:19 UTC
[tika] branch main updated: TIKA-3605 -- swap out singleThreadExecutor
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 78dbd3d TIKA-3605 -- swap out singleThreadExecutor
78dbd3d is described below
commit 78dbd3db3564cd303737661293ac18074cecab64
Author: tballison <ta...@apache.org>
AuthorDate: Wed Dec 1 10:58:09 2021 -0500
TIKA-3605 -- swap out singleThreadExecutor
---
.../src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java | 2 +-
tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java | 2 +-
tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java | 2 +-
tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java | 2 +-
tika-fuzzing/src/main/java/org/apache/tika/fuzzing/cli/FuzzOne.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tika-batch/src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java b/tika-batch/src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java
index 5501b20..975f773 100644
--- a/tika-batch/src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java
+++ b/tika-batch/src/main/java/org/apache/tika/batch/fs/FSBatchProcessCLI.java
@@ -134,7 +134,7 @@ public class FSBatchProcessCLI {
final Thread mainThread = Thread.currentThread();
- ExecutorService executor = Executors.newSingleThreadExecutor();
+ ExecutorService executor = Executors.newFixedThreadPool(1);
Future<ParallelFileProcessingResult> futureResult = executor.submit(process);
ParallelFileProcessingResult result = futureResult.get();
diff --git a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
index 19b31cb..4ea3947 100644
--- a/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
+++ b/tika-batch/src/test/java/org/apache/tika/batch/fs/FSBatchTestBase.java
@@ -273,7 +273,7 @@ public abstract class FSBatchTestBase extends TikaTest {
}
protected ParallelFileProcessingResult run(BatchProcess process) throws Exception {
- ExecutorService executor = Executors.newSingleThreadExecutor();
+ ExecutorService executor = Executors.newFixedThreadPool(1);
Future<ParallelFileProcessingResult> futureResult = executor.submit(process);
return futureResult.get(10, TimeUnit.SECONDS);
}
diff --git a/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java b/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
index 7631799..9bcd4f7 100644
--- a/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
+++ b/tika-core/src/main/java/org/apache/tika/pipes/PipesClient.java
@@ -368,7 +368,7 @@ public class PipesClient implements Closeable {
throw new IllegalArgumentException("pipesClientId=" + pipesClientId +
": PipesClient closed");
}
- executorService = Executors.newSingleThreadExecutor();
+ executorService = Executors.newFixedThreadPool(1);
}
LOG.info("pipesClientId={}: restarting process", pipesClientId);
} else {
diff --git a/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java b/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
index abd71d7..7d576d7 100644
--- a/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
+++ b/tika-core/src/test/java/org/apache/tika/mime/MimeTypesReaderTest.java
@@ -305,7 +305,7 @@ public class MimeTypesReaderTest {
@Test
public void testMultiThreaded() throws Exception {
MimeTypes mimeTypes = MimeTypes.getDefaultMimeTypes();
- Executors.newSingleThreadExecutor().execute(() -> {
+ Executors.newFixedThreadPool(1).execute(() -> {
try {
for (int i = 0; i < 500 && !stop; i++) {
mimeTypes.forName("abc" + i + "/abc");
diff --git a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/cli/FuzzOne.java b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/cli/FuzzOne.java
index af2351d..85e8047 100644
--- a/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/cli/FuzzOne.java
+++ b/tika-fuzzing/src/main/java/org/apache/tika/fuzzing/cli/FuzzOne.java
@@ -123,7 +123,7 @@ public class FuzzOne {
Files.delete(target);
throw t;
}
- ExecutorService executor = Executors.newSingleThreadExecutor();
+ ExecutorService executor = Executors.newFixedThreadPool(1);
Future<Integer> future = executor.submit(new ParseTask(target));
try {