From 275f0f07851b1d7e1733837f91993716e64fedcc Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 16 Dec 2019 15:36:27 +0100
Subject: [PATCH] revert changes in AbstractCaosDBServerResource
---
.../server/resource/AbstractCaosDBServerResource.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java b/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java
index 41a2f681..ea4e65f0 100644
--- a/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java
+++ b/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java
@@ -408,8 +408,12 @@ public abstract class AbstractCaosDBServerResource extends ServerResource {
try {
getRequest().getAttributes().put("THROWN", t);
throw t;
- } catch (final AuthenticationException | AuthorizationException e) {
- return error(ServerMessages.NOT_PERMITTED, Status.CLIENT_ERROR_FORBIDDEN);
+ } catch (final AuthenticationException e) {
+ getResponse().setStatus(Status.CLIENT_ERROR_FORBIDDEN);
+ return null;
+ } catch (final AuthorizationException e) {
+ getResponse().setStatus(Status.CLIENT_ERROR_FORBIDDEN);
+ return null;
} catch (final Message m) {
return error(m, Status.CLIENT_ERROR_BAD_REQUEST);
} catch (final FileUploadException e) {
--
GitLab