summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2011-03-24 16:12:01 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2011-03-24 16:12:01 +0000
commit31e6705504568568934a43a4be233b114fa38fef (patch)
treece0c02d049cea307b25c552fe77202c9eda7bf76 /src
parent3e02fb83101b107935c6466d27c20065951faca0 (diff)
downloadvaadin-framework-31e6705504568568934a43a4be233b114fa38fef.tar.gz
vaadin-framework-31e6705504568568934a43a4be233b114fa38fef.zip
merged #6687 fix from 6.6
svn changeset:17920/svn branch:6.5
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index a50cf3290a..a9e5f2c827 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -625,7 +625,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
* @throws IOException
* if the writing failed due to input/output error.
*/
- protected final void criticalNotification(HttpServletRequest request,
+ protected void criticalNotification(HttpServletRequest request,
HttpServletResponse response, String caption, String message,
String details, String url) throws IOException {
@@ -692,7 +692,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
* Output to write (UTF-8 encoded)
* @throws IOException
*/
- private void writeResponse(HttpServletResponse response,
+ protected static final void writeResponse(HttpServletResponse response,
String contentType, String output) throws IOException {
response.setContentType(contentType);
final ServletOutputStream out = response.getOutputStream();