Fix logout cleanup steps order Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/2e8fbb93 Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/2e8fbb93 Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/2e8fbb93
Branch: refs/heads/swellrt Commit: 2e8fbb93befd7a81832c1e253e15a3328f26ca74 Parents: 349931e Author: Pablo Ojanguren <[email protected]> Authored: Thu Sep 8 16:27:02 2016 +0200 Committer: Pablo Ojanguren <[email protected]> Committed: Thu Sep 8 16:27:02 2016 +0200 ---------------------------------------------------------------------- wave/src/main/java/org/swellrt/api/SwellRT.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/2e8fbb93/wave/src/main/java/org/swellrt/api/SwellRT.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/swellrt/api/SwellRT.java b/wave/src/main/java/org/swellrt/api/SwellRT.java index 20ce0ec..8077c4d 100644 --- a/wave/src/main/java/org/swellrt/api/SwellRT.java +++ b/wave/src/main/java/org/swellrt/api/SwellRT.java @@ -325,23 +325,23 @@ public class SwellRT implements EntryPoint, UnsavedDataListener { try { + for (TextEditor editor : editorRegistry.values()) + editor.cleanUp(); + editorRegistry.clear(); + for (ModelJS co : objectRegistry.values()) SwellRTUtils.deleteJsObject(co); - objectRegistry.clear(); for (WaveLoader wave : waveRegistry.values()) wave.destroy(); - waveRegistry.clear(); - for (TextEditor editor : editorRegistry.values()) - editor.cleanUp(); - editorRegistry.clear(); - shouldOpenWebsocket = true; - if (websocket != null) + if (websocket != null) { websocket.disconnect(false); + websocket = null; + } // // Call server to close remote session
