This is an automated email from the ASF dual-hosted git repository.

tballison pushed a commit to branch TIKA-4839-tweaks
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/TIKA-4839-tweaks by this push:
     new ef29333126 TIKA-4839: address review nits -- tersify CHANGES, sentinel 
close() sets closed, name unused param
ef29333126 is described below

commit ef29333126eab2d14e3f79ba5d8aa33946d56c5b
Author: tallison <[email protected]>
AuthorDate: Thu Aug 27 13:51:30 2026 -0400

    TIKA-4839: address review nits -- tersify CHANGES, sentinel close() sets 
closed, name unused param
---
 CHANGES.txt                                                  | 12 ++++--------
 .../org/apache/tika/pipes/core/PerClientServerManager.java   |  2 +-
 .../org/apache/tika/pipes/core/SentinelServerManager.java    |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index eb409c8654..355013d99f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,13 +1,9 @@
 Release 4.1.0 - unreleased
 
-   * tika-pipes: a parse that raced PipesParser.close()/AsyncProcessor.close()
-     threw IllegalStateException out of PipesParser.parse() in per-client mode;
-     both modes now return a FAILED_TO_INITIALIZE result, which a caller can 
act
-     on. ServerManager's restart-reporting surface is reduced to one spelling 
--
-     markServerForRestart(RestartReason, long) and 
handleCrashAndGetExitCode(long),
-     both abstract. The previous no-arg and reasonless forms defaulted to one
-     another, so an implementation that overrode only one left the others
-     silently inert (TIKA-4839).
+   * tika-pipes: a parse racing PipesParser.close() now returns 
FAILED_TO_INITIALIZE
+     instead of throwing IllegalStateException. ServerManager restart 
reporting is
+     now the single abstract pair markServerForRestart(RestartReason, long) and
+     handleCrashAndGetExitCode(long); the old defaulting overloads are removed 
(TIKA-4839).
 
    * Add Micrometer reporting and opt-in endpoint for tika-server (TIKA-4839).
      
diff --git 
a/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/PerClientServerManager.java
 
b/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/PerClientServerManager.java
index 2c2e44961d..103cb397a3 100644
--- 
a/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/PerClientServerManager.java
+++ 
b/tika-pipes/tika-pipes-core/src/main/java/org/apache/tika/pipes/core/PerClientServerManager.java
@@ -298,7 +298,7 @@ public class PerClientServerManager implements 
ServerManager {
      * Shared mode is where staleness is real.
      */
     @Override
-    public void markServerForRestart(RestartReason reason, long generation) {
+    public void markServerForRestart(RestartReason reason, long 
ignoredGeneration) {
         LOG.info("clientId={}: marking server for restart ({})", clientId, 
reason);
         markForRestart(reason);
     }
diff --git 
a/tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/SentinelServerManager.java
 
b/tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/SentinelServerManager.java
index 7fae4988c5..49a6813ed6 100644
--- 
a/tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/SentinelServerManager.java
+++ 
b/tika-pipes/tika-pipes-core/src/test/java/org/apache/tika/pipes/core/SentinelServerManager.java
@@ -91,6 +91,6 @@ final class SentinelServerManager implements ServerManager {
 
     @Override
     public void close() {
-        // nothing to close
+        closed = true;
     }
 }

Reply via email to