move source upload authorization exception handling to lower level

zanata · Jul 16, 2013 · 1cc81e2 · 1cc81e2
1 parent 5e14a3a
commit 1cc81e2
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
@@ -226,12 +226,6 @@ public Response uploadSourceFile( @PathParam("projectSlug") String projectSlug,
          }
          return sourceUploadSuccessResponse(isNewDocument(projectSlug, iterationSlug, docId), totalChunks);
       }
-      catch (AuthorizationException e)
-      {
-         return Response.status(Status.UNAUTHORIZED)
-         .entity(new ChunkUploadResponse(e.getMessage()))
-         .build();
-      }
       catch (ChunkUploadException e)
       {
          return Response.status(e.getStatusCode())
@@ -260,8 +254,15 @@ private InputStream getInputStream(Optional<File> tempFile, DocumentFileUploadFo
 
    private void checkSourceUploadPreconditions(String projectSlug, String iterationSlug, String docId, DocumentFileUploadForm uploadForm)
    {
-      checkUploadPreconditions(projectSlug, iterationSlug, docId, uploadForm);
-      checkSourceUploadAllowed(projectSlug, iterationSlug);
+      try
+      {
+         checkUploadPreconditions(projectSlug, iterationSlug, docId, uploadForm);
+         checkSourceUploadAllowed(projectSlug, iterationSlug);
+      }
+      catch (AuthorizationException e)
+      {
+         throw new ChunkUploadException(Status.UNAUTHORIZED, e.getMessage());
+      }
       checkValidSourceUploadType(uploadForm);
    }