Throw exception for non-UIDL requests again (#10332)

Change-Id: Ia523927c5b990eff7f25f0af9cd5dd080a07c21d

1 files changed, 21 insertions, 12 deletions

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 14a7ca211f..94ffecb909 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -441,7 +441,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @throws IOException
      *             if the writing failed due to input/output error.
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected void criticalNotification(VaadinServletRequest request,
@@ -535,7 +536,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *            the resource path.
      * @return the resource path.
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected static String getResourcePath(ServletContext servletContext,
@@ -576,10 +578,10 @@ public class VaadinServlet extends HttpServlet implements Constants {
         } else {
             if (errorHandler != null) {
                 errorHandler.error(new ErrorEvent(e));
-            } else {
-                // Re-throw other exceptions
-                throw new ServletException(e);
             }
+
+            // Re-throw other exceptions
+            throw new ServletException(e);
         }
 
     }
@@ -592,7 +594,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param themeName
      * @return
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected static String stripSpecialChars(String themeName) {
@@ -626,7 +629,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @throws IOException
      * @throws ServletException
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     void handleServiceSessionExpired(VaadinServletRequest request,
@@ -980,7 +984,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * 
      * @since 6.6.7
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected boolean isAllowedVAADINResourceUrl(HttpServletRequest request,
@@ -1071,7 +1076,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @author Vaadin Ltd
      * @since 7.0.0
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected enum RequestType {
@@ -1082,7 +1088,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param request
      * @return
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinServletRequest request) {
@@ -1174,7 +1181,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      *             if the application is denied access to the persistent data
      *             store represented by the given URL.
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected URL getApplicationUrl(HttpServletRequest request)
@@ -1214,7 +1222,8 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param unsafe
      * @return a safe string to be added inside an html tag
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public static final String safeEscapeForHtml(String unsafe) {