]> source.dussan.org Git - vaadin-framework.git/commit
Fix improper merge of 3d0ff32b from 7.1 to master (#13620)
authorJohannes Dahlström <johannesd@vaadin.com>
Fri, 2 May 2014 15:29:42 +0000 (18:29 +0300)
committerArtur Signell <artur@vaadin.com>
Thu, 8 May 2014 17:36:22 +0000 (17:36 +0000)
commitf21c10882e74ec58260cae289c4180c19ff8a816
treeefd2f091b72a04bc17cdf308539e1d2767f1a3a4
parent3184af5ac142b81ee656f0d5ea84272ac7e0ded8
Fix improper merge of 3d0ff32b from 7.1 to master (#13620)

Correctly call PushConnection.disconnect instead of setting to null.
Also remove the obsolete PushHandler.disconnectCallback.

Change-Id: Ied055d489a269b016318947cd89cf0b46003c596
server/src/com/vaadin/server/communication/PushHandler.java
uitest/src/com/vaadin/tests/push/PushWithPreserveOnRefresh.java [new file with mode: 0644]
uitest/src/com/vaadin/tests/push/PushWithPreserveOnRefreshTest.java [new file with mode: 0644]