[exo-jcr-commits] exo-jcr SVN: r2382 - ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet.

[do-not-reply at jboss.org]

Author: aparfonov
Date: 2010-05-17 02:56:21 -0400 (Mon, 17 May 2010)
New Revision: 2382

Modified:
   ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java
Log:
EXOJCR-728 : 

Modified: ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java
===================================================================
--- ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java	2010-05-16 13:49:27 UTC (rev 2381)
+++ ws/trunk/exo.ws.rest.core/src/main/java/org/exoplatform/services/rest/servlet/RestServlet.java	2010-05-17 06:56:21 UTC (rev 2382)
@@ -19,6 +19,7 @@
 package org.exoplatform.services.rest.servlet;
 
 import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.component.RequestLifeCycle;
 import org.exoplatform.container.web.AbstractHttpServlet;
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
@@ -32,7 +33,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.SocketException;
 import java.util.List;
 import java.util.Map;
 
@@ -45,7 +45,7 @@
 
 /**
  * This servlet is front-end for the REST engine.
- * 
+ *
  * @author <a href="mailto:andrew00x at gmail.com">Andrey Parfonov</a>
  * @version $Id: $
  */
@@ -67,6 +67,8 @@
       throws IOException, ServletException
    {
 
+      RequestLifeCycle.begin(container);
+
       RequestHandler requestHandler = (RequestHandler)container.getComponentInstanceOfType(RequestHandler.class);
 
       EnvironmentContext env = new EnvironmentContext();
@@ -90,7 +92,7 @@
          }
          else
          {
-            throw new ServletException(ioe);
+            throw ioe;
          }
       }
       catch (Exception e)
@@ -100,6 +102,7 @@
       finally
       {
          EnvironmentContext.setCurrent(null);
+         RequestLifeCycle.end();
       }
    }
 
@@ -144,7 +147,9 @@
       public void writeHeaders(GenericContainerResponse response) throws IOException
       {
          if (servletResponse.isCommitted())
+         {
             return;
+         }
 
          servletResponse.setStatus(response.getStatus());
 
@@ -158,7 +163,9 @@
                {
                   String value = null;
                   if (o != null && (value = HeaderHelper.getHeaderAsString(o)) != null)
+                  {
                      servletResponse.addHeader(name, value);
+                  }
                }
             }
          }