diff --git a/src/main/java/org/caosdb/server/CaosDBServer.java b/src/main/java/org/caosdb/server/CaosDBServer.java index a7aa4f8d7ee97702a6aa17e0679ef4eea29032aa..091d417320dccfa944a772e4ec15ddf830009f52 100644 --- a/src/main/java/org/caosdb/server/CaosDBServer.java +++ b/src/main/java/org/caosdb/server/CaosDBServer.java @@ -326,7 +326,7 @@ public class CaosDBServer extends Application { // ChecksumUpdater ChecksumUpdater.start(); - + ThreadContext.remove(); } } else { diff --git a/src/main/java/org/caosdb/server/jobs/Job.java b/src/main/java/org/caosdb/server/jobs/Job.java index 14d1185c5c5cdeadc77bef3610496708f8da4d87..9bca9eb2e1b9a78e9e73a79b5f31161b345f2dc1 100644 --- a/src/main/java/org/caosdb/server/jobs/Job.java +++ b/src/main/java/org/caosdb/server/jobs/Job.java @@ -27,7 +27,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.AuthorizationException; import org.apache.shiro.authz.Permission; import org.apache.shiro.subject.Subject; diff --git a/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java b/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java index 7d9dbc910e4851292cd6f2d13b916bbc93a194fd..112692c89a403366eb9eeb02d32355982a96a236 100644 --- a/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java +++ b/src/main/java/org/caosdb/server/jobs/core/CheckPropValid.java @@ -23,8 +23,9 @@ package org.caosdb.server.jobs.core; import static org.caosdb.server.utils.ServerMessages.ENTITY_DOES_NOT_EXIST; -import org.apache.shiro.authz.AuthorizationException; + import com.google.common.base.Objects; +import org.apache.shiro.authz.AuthorizationException; import org.caosdb.server.database.exceptions.EntityDoesNotExistException; import org.caosdb.server.database.exceptions.EntityWasNotUniqueException; import org.caosdb.server.entity.EntityInterface; @@ -126,12 +127,12 @@ public class CheckPropValid extends EntityJob { } catch (final Message m) { property.addError(m); } catch (AuthorizationException e) { - property.addError( ServerMessages.AUTHORIZATION_ERROR); + property.addError(ServerMessages.AUTHORIZATION_ERROR); property.addInfo(e.getMessage()); } catch (final EntityDoesNotExistException e) { - property.addError( ENTITY_DOES_NOT_EXIST); + property.addError(ENTITY_DOES_NOT_EXIST); } catch (final EntityWasNotUniqueException e) { - property.addError( ServerMessages.ENTITY_NAME_DUPLICATES); + property.addError(ServerMessages.ENTITY_NAME_DUPLICATES); } }