[jboss-cvs] jboss-seam/src/pdf/org/jboss/seam/pdf ...

[Gavin King]

  User: gavin   
  Date: 07/02/22 00:02:34

  Modified:    src/pdf/org/jboss/seam/pdf  DocumentStoreServlet.java
  Log:
  ws
  
  Revision  Changes    Path
  1.8       +20 -8     jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DocumentStoreServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/pdf/org/jboss/seam/pdf/DocumentStoreServlet.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- DocumentStoreServlet.java	20 Feb 2007 04:14:20 -0000	1.7
  +++ DocumentStoreServlet.java	22 Feb 2007 05:02:34 -0000	1.8
  @@ -31,15 +31,20 @@
           Manager.instance().restoreConversation(request.getParameterMap());
           Lifecycle.resumeConversation(session);
           Manager.instance().handleConversationPropagation(request.getParameterMap());
  -        try {
  +        try 
  +        {
              doWork(request, response);
              //TODO: conversation timeout
              Manager.instance().endRequest(ContextAdaptor.getSession(session));
              Lifecycle.endRequest(session);
  -        } catch (Exception e) {
  +        } 
  +        catch (Exception e) 
  +        {
              Lifecycle.endRequest();           
              throw new ServletException(e);
  -        } finally {
  +        } 
  +        finally 
  +        {
              Lifecycle.setServletRequest(null);
              Lifecycle.setPhaseId(null);
           }
  @@ -57,7 +62,8 @@
                   
           DocumentStore store = DocumentStore.instance();
           
  -        if (store.idIsValid(contentId)) {
  +        if (store.idIsValid(contentId)) 
  +        {
               DocumentData documentData = store.getDocumentData(contentId);
               
               byte[] data = documentData.getData();       
  @@ -69,14 +75,20 @@
               if (data != null) {
                   response.getOutputStream().write(data);
               }
  -        } else {
  +        } 
  +        else 
  +        {
                String error = store.getErrorPage();             
  -             if (error != null) {      
  -                 if (error.startsWith("/")) {
  +             if (error != null) 
  +             {      
  +                 if (error.startsWith("/")) 
  +                 {
                        error = request.getContextPath() + error;
                    }
                    response.sendRedirect(error);
  -             } else {
  +             } 
  +             else 
  +             {
                    response.sendError(404);
                }
           }