From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 30 Oct 2009 10:09:54 +0000 (+0000)
Subject: merged [9503] from 6.1
X-Git-Tag: 6.7.0.beta1~2359
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1d78f856c640c7d2746f0b19d6fccb128c67ccd5;p=vaadin-framework.git

merged [9503] from 6.1

svn changeset:9504/svn branch:6.2
---

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index f27bf51899..6c11f0d098 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -45,11 +45,11 @@ import com.vaadin.ui.Window;
 /**
  * Abstract implementation of the ApplicationServlet which handles all
  * communication between the client and the server.
- *
+ * 
  * It is possible to extend this class to provide own functionality but in most
  * cases this is unnecessary.
- *
- *
+ * 
+ * 
  * @author IT Mill Ltd.
  * @version
  * @VERSION@
@@ -191,7 +191,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Called by the servlet container to indicate to a servlet that the servlet
      * is being placed into service.
-     *
+     * 
      * @param servletConfig
      *            the object containing the servlet's configuration and
      *            initialization parameters
@@ -260,7 +260,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Gets an application property value.
-     *
+     * 
      * @param parameterName
      *            the Name or the parameter.
      * @return String value or null if not found
@@ -281,7 +281,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Gets an system property value.
-     *
+     * 
      * @param parameterName
      *            the Name or the parameter.
      * @return String value or null if not found
@@ -310,7 +310,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Gets an application or system property value.
-     *
+     * 
      * @param parameterName
      *            the Name or the parameter.
      * @param defaultValue
@@ -340,7 +340,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Returns true if the servlet is running in production mode. Production
      * mode disables all debug facilities.
-     *
+     * 
      * @return true if in production mode, false if in debug mode
      */
     public boolean isProductionMode() {
@@ -350,7 +350,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Receives standard HTTP requests from the public service method and
      * dispatches them.
-     *
+     * 
      * @param request
      *            the object that contains the request the client made of the
      *            servlet.
@@ -514,7 +514,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Send notification to client's application. Used to notify client of
      * critical errors and session expiration due to long inactivity. Server has
      * no knowledge of what application client refers to.
-     *
+     * 
      * @param request
      *            the HTTP request instance.
      * @param response
@@ -576,7 +576,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Returns the application instance to be used for the request. If an
      * existing instance is not found a new one is created or null is returned
      * to indicate that the application is not available.
-     *
+     * 
      * @param request
      * @param requestType
      * @return
@@ -641,7 +641,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Check if the request should create an application if an existing
      * application is not found.
-     *
+     * 
      * @param request
      * @param requestType
      * @return true if an application should be created, false otherwise
@@ -672,7 +672,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Gets resource path using different implementations. Required to
      * supporting different servlet container implementations (application
      * servers).
-     *
+     * 
      * @param servletContext
      * @param path
      *            the resource path.
@@ -701,16 +701,16 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * processing, when a certain URI is requested. The handlers are invoked
      * before any windows URIs are processed and if a DownloadStream is returned
      * it is sent to the client.
-     *
+     * 
      * @param stream
      *            the download stream.
-     *
+     * 
      * @param request
      *            the HTTP request instance.
      * @param response
      *            the HTTP response to write to.
      * @throws IOException
-     *
+     * 
      * @see com.vaadin.terminal.URIHandler
      */
     @SuppressWarnings("unchecked")
@@ -782,7 +782,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
                 out.flush();
             }
             out.close();
-
+            data.close();
         }
 
     }
@@ -791,7 +791,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Creates a new application and registers it into WebApplicationContext
      * (aka session). This is not meant to be overridden. Override
      * getNewApplication to create the application instance in a custom way.
-     *
+     * 
      * @param request
      * @return
      * @throws ServletException
@@ -832,7 +832,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Returns the theme for given request/window
-     *
+     * 
      * @param request
      * @param window
      * @return
@@ -863,7 +863,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Returns the default theme. Must never return null.
-     *
+     * 
      * @return
      */
     public static String getDefaultTheme() {
@@ -873,7 +873,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Calls URI handlers for the request. If an URI handler returns a
      * DownloadStream the stream is passed to the client for downloading.
-     *
+     * 
      * @param applicationManager
      * @param window
      * @param request
@@ -920,7 +920,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
                  * Invalidate session (weird to have session if we're saying
                  * that it's expired, and worse: portal integration will fail
                  * since the session is not created by the portal.
-                 *
+                 * 
                  * Session must be invalidated before criticalNotification as it
                  * commits the response.
                  */
@@ -976,7 +976,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Creates a new application for the given request.
-     *
+     * 
      * @param request
      *            the HTTP request.
      * @return A new Application instance.
@@ -987,7 +987,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Starts the application if it is not already running.
-     *
+     * 
      * @param request
      * @param application
      * @param webApplicationContext
@@ -1014,7 +1014,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Check if this is a request for a static resource and, if it is, serve the
      * resource to the client. Returns true if a file was served and the request
      * has been handled, false otherwise.
-     *
+     * 
      * @param request
      * @param response
      * @return
@@ -1046,7 +1046,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Serve resources from VAADIN directory.
-     *
+     * 
      * @param request
      * @param response
      * @throws IOException
@@ -1156,7 +1156,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Get system messages from the current application class
-     *
+     * 
      * @return
      */
     protected SystemMessages getSystemMessages() {
@@ -1192,10 +1192,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Return the URL from where static files, e.g. the widgetset and the theme,
      * are served. In a standard configuration the VAADIN folder inside the
      * returned folder is what is used for widgetsets and themes.
-     *
+     * 
      * The returned folder is usually the same as the context path and
      * independent of the application.
-     *
+     * 
      * @param request
      * @return The location of static resources (should contain the VAADIN
      *         directory). Never ends with a slash (/).
@@ -1217,7 +1217,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * The default method to fetch static files location. This method does not
      * check for request attribute {@value #REQUEST_VAADIN_STATIC_FILE_PATH}.
-     *
+     * 
      * @param request
      * @return
      */
@@ -1260,7 +1260,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Remove any heading or trailing "what" from the "string".
-     *
+     * 
      * @param string
      * @param what
      * @return
@@ -1279,7 +1279,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Write a redirect response to the main page of the application.
-     *
+     * 
      * @param request
      * @param response
      * @throws IOException
@@ -1309,7 +1309,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * {@link #writeAjaxPageHtmlMainDiv(BufferedWriter, String, String, String)}
      * <li> {@link #writeAjaxPageHtmlBodyEnd(BufferedWriter)}
      * </ul>
-     *
+     * 
      * @param request
      *            the HTTP request.
      * @param response
@@ -1421,10 +1421,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Get the URI for the application theme.
-     *
+     * 
      * A portal-wide default theme is fetched from the portal shared resource
      * directory (if any), other themes from the portlet.
-     *
+     * 
      * @param themeName
      * @param request
      * @return
@@ -1454,7 +1454,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Override this method if you want to add some custom html around around
      * the div element into which the actual vaadin application will be
      * rendered.
-     *
+     * 
      * @param page
      * @param appId
      * @param classNames
@@ -1470,12 +1470,12 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     }
 
     /**
-     *
+     * 
      * * Method to write the script part of the page which loads needed vaadin
      * scripts and themes.
      * <p>
      * Override this method if you want to add some custom html around scripts.
-     *
+     * 
      * @param window
      * @param themeName
      * @param application
@@ -1503,8 +1503,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
             // If no shared widgetset is specified, the default widgetset is
             // assumed to be in the servlet/portlet itself.
             requestWidgetset = getApplicationOrSystemProperty(
-                    PARAMETER_WIDGETSET,
-                    DEFAULT_WIDGETSET);
+                    PARAMETER_WIDGETSET, DEFAULT_WIDGETSET);
         }
 
         String widgetset;
@@ -1618,14 +1617,14 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     }
 
     /**
-     *
+     * 
      * Method to open the body tag of the html kickstart page.
      * <p>
      * This method is responsible for closing the head tag and opening the body
      * tag.
      * <p>
      * Override this method if you want to add some custom html to the page.
-     *
+     * 
      * @param page
      * @throws IOException
      */
@@ -1640,7 +1639,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * <p>
      * Override this method if you want to add some custom html to the header of
      * the page.
-     *
+     * 
      * @param page
      * @param title
      * @param themeUri
@@ -1672,7 +1671,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * <p>
      * Override this method if you want to add some custom html to the very
      * beginning of the page.
-     *
+     * 
      * @param page
      * @throws IOException
      */
@@ -1692,7 +1691,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
      * Method to set http request headers for the Vaadin kickstart page.
      * <p>
      * Override this method if you need to customize http headers of the page.
-     *
+     * 
      * @param response
      */
     protected void setAjaxPageHeaders(HttpServletResponse response) {
@@ -1713,7 +1712,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Gets the current application URL from request.
-     *
+     * 
      * @param request
      *            the HTTP request.
      * @throws MalformedURLException
@@ -1753,7 +1752,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Gets the existing application for given request. Looks for application
      * instance for given request based on the requested URL.
-     *
+     * 
      * @param request
      *            the HTTP request.
      * @param allowSessionCreation
@@ -1813,7 +1812,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Ends the application.
-     *
+     * 
      * @param request
      *            the HTTP request.
      * @param response
@@ -1844,7 +1843,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Gets the existing application or create a new one. Get a window within an
      * application based on the requested URI.
-     *
+     * 
      * @param request
      *            the HTTP Request.
      * @param application
@@ -1890,7 +1889,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
     /**
      * Returns the path info; note that this _can_ be different than
      * request.getPathInfo() (e.g application runner).
-     *
+     * 
      * @param request
      * @return
      */
@@ -1900,7 +1899,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
     /**
      * Gets relative location of a theme resource.
-     *
+     * 
      * @param theme
      *            the Theme name.
      * @param resource
@@ -1947,7 +1946,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
         /**
          * Gets the contained throwable.
-         *
+         * 
          * @see com.vaadin.terminal.Terminal.ErrorEvent#getThrowable()
          */
         public Throwable getThrowable() {
@@ -1956,7 +1955,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
         /**
          * Gets the source ParameterHandler.
-         *
+         * 
          * @see com.vaadin.terminal.ParameterHandler.ErrorEvent#getParameterHandler()
          */
         public ParameterHandler getParameterHandler() {
@@ -1976,7 +1975,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
         private final Throwable throwable;
 
         /**
-         *
+         * 
          * @param owner
          * @param throwable
          */
@@ -1987,7 +1986,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
         /**
          * Gets the contained throwable.
-         *
+         * 
          * @see com.vaadin.terminal.Terminal.ErrorEvent#getThrowable()
          */
         public Throwable getThrowable() {
@@ -1996,7 +1995,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet {
 
         /**
          * Gets the source URIHandler.
-         *
+         * 
          * @see com.vaadin.terminal.URIHandler.ErrorEvent#getURIHandler()
          */
         public URIHandler getURIHandler() {