summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-10-05 13:38:32 +0300
committerArtur Signell <artur@vaadin.com>2012-10-05 13:38:55 +0300
commitbc19cb58d22ad18284e7095d72f45ef040298943 (patch)
treeb66db15132bb00aecbe3468c9fab5cfbc595642b /server
parente2b584307fcbfb6cbaa20c06f069a2f49eb13ac5 (diff)
downloadvaadin-framework-bc19cb58d22ad18284e7095d72f45ef040298943.tar.gz
vaadin-framework-bc19cb58d22ad18284e7095d72f45ef040298943.zip
Allow servletInitialized,portletInitialized to throw exception (#9848)
Change-Id: Ib0fd2524ba82998063b21d6c3b56897270c24b2c
Diffstat (limited to 'server')
-rw-r--r--server/src/com/vaadin/server/VaadinPortlet.java2
-rw-r--r--server/src/com/vaadin/server/VaadinServlet.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index b0cc92b85e..231a463222 100644
--- 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 0620035274..eb375e0b92 100644
--- 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
}