Allow servletInitialized,portletInitialized to throw exception (#9848)

Change-Id: Ib0fd2524ba82998063b21d6c3b56897270c24b2c

diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index b0cc92b85e03fe7a663048d9e788ebcc9129fdcf..231a4632220ba3133e46ff6d87d5172b90468211 100644 (file)
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -256,7 +256,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
         CurrentInstance.clearAll();
     }
 
-    protected void portletInitialized() {
+    protected void portletInitialized() throws PortletException {
 
     }
 

diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 06200352743b5f30232be5af6d01cb6b2624d056..eb375e0b92e422b558865543ebb9565ff3a87f47 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -85,13 +85,13 @@ public class VaadinServlet extends HttpServlet implements Constants {
      * @param servletConfig
      *            the object containing the servlet's configuration and
      *            initialization parameters
-     * @throws javax.servlet.ServletException
+     * @throws ServletException
      *             if an exception has occurred that interferes with the
      *             servlet's normal operation.
      */
     @Override
     public void init(javax.servlet.ServletConfig servletConfig)
-            throws javax.servlet.ServletException {
+            throws ServletException {
         CurrentInstance.clearAll();
         setCurrent(this);
         super.init(servletConfig);
@@ -126,7 +126,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
         CurrentInstance.clearAll();
     }
 
-    protected void servletInitialized() {
+    protected void servletInitialized() throws ServletException {
         // Empty by default
     }
 

diff --git a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
index f6f1add94051e0229b0fcfdbd258adca598d6e8b..12d1cb2c383aea1909b5bf490023a0a537a4c618 100644 (file)
--- a/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
+++ b/uitest/src/com/vaadin/launcher/ApplicationRunnerServlet.java
@@ -74,7 +74,7 @@ public class ApplicationRunnerServlet extends LegacyVaadinServlet {
     }
 
     @Override
-    protected void servletInitialized() {
+    protected void servletInitialized() throws ServletException {
         super.servletInitialized();
         getService().addSessionInitListener(new SessionInitListener() {
             @Override