diff options
author | Artur Signell <artur@vaadin.com> | 2013-11-11 15:56:06 +0200 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2013-11-11 15:56:07 +0200 |
commit | e75dc7e789940e6396538318dd0f1e490efeedb7 (patch) | |
tree | 376ca8bfc880b35fa0c1ded5ba96c7ed3e8430a1 /server | |
parent | bc0d55197a2b7fd8a6ac163688026d92203f2618 (diff) | |
parent | 049b9d99ff887e9408e23cbd169431140dd0afa9 (diff) | |
download | vaadin-framework-e75dc7e789940e6396538318dd0f1e490efeedb7.tar.gz vaadin-framework-e75dc7e789940e6396538318dd0f1e490efeedb7.zip |
Merge changes from origin/7.1
51a46a0 Recovering scroll position after regression problems. (#12727)
c464dcf Convert push test to TB3 so it has a chance to pass
2c6d010 Fixes test issues preventing it from passing
049b9d9 Remove out of order flush() (#12283)
Change-Id: I600294f41a4a1b7682f99bddb03042f84bee2702
Diffstat (limited to 'server')
-rw-r--r-- | server/src/com/vaadin/server/VaadinServlet.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java index d34cd3bf0e..baf97d23d9 100644 --- a/server/src/com/vaadin/server/VaadinServlet.java +++ b/server/src/com/vaadin/server/VaadinServlet.java @@ -426,8 +426,6 @@ public class VaadinServlet extends HttpServlet implements Constants { outWriter.print(output); outWriter.flush(); outWriter.close(); - out.flush(); - } /** |