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 2019/08/16 22:34:19 UTC
[tika] 01/05: TIKA-2924 -- tika server should return 400 for bad
headers, not 500
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 8257e85ae0849e4ce120d5e1be8a91afac5b557c
Author: TALLISON <ta...@apache.org>
AuthorDate: Fri Aug 16 12:22:16 2019 -0400
TIKA-2924 -- tika server should return 400 for bad headers, not 500
---
.../src/main/java/org/apache/tika/server/resource/TikaResource.java | 6 ++++--
.../src/test/java/org/apache/tika/server/TikaResourceTest.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
index 2eb3baf..2a85305 100644
--- a/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
+++ b/tika-server/src/main/java/org/apache/tika/server/resource/TikaResource.java
@@ -265,8 +265,10 @@ public class TikaResource {
}
} catch (Throwable ex) {
- throw new WebApplicationException(String.format(Locale.ROOT,
- "%s is an invalid %s header", key, X_TIKA_OCR_HEADER_PREFIX));
+ throw new WebApplicationException(
+ String.format(Locale.ROOT,
+ "%s is an invalid %s header",
+ key, X_TIKA_OCR_HEADER_PREFIX), Response.Status.BAD_REQUEST);
}
}
diff --git a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
index ef97629..0f46f66 100644
--- a/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
+++ b/tika-server/src/test/java/org/apache/tika/server/TikaResourceTest.java
@@ -286,7 +286,7 @@ public class TikaResourceTest extends CXFTestBase {
.accept("text/plain")
.header(TikaResource.X_TIKA_PDF_HEADER_PREFIX + "OcrStrategy", "non-sense-value")
.put(ClassLoader.getSystemResourceAsStream("testOCR.pdf"));
- assertEquals(500, response.getStatus());
+ assertEquals(400, response.getStatus());
}
//TIKA-2669
@@ -385,7 +385,7 @@ public class TikaResourceTest extends CXFTestBase {
"trustedPageSeparator",
"\u0020")
.put(ClassLoader.getSystemResourceAsStream("testOCR.pdf"));
- assertEquals(500, response.getStatus());
+ assertEquals(400, response.getStatus());
}