From 6cb2e6180bb827baadd315a75f906e471f7d2b35 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 26 Jun 2013 03:16:22 +0800 Subject: [PATCH] IDEMPIERE-729 Firefox becomes very slow randomly after working on zkwebui. Some improvement but still slow down over time with ever growing memory usage. --- .../src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java | 2 +- .../src/org/adempiere/webui/panel/action/ExportAction.java | 1 - .../src/org/adempiere/webui/panel/action/FileImportAction.java | 1 - .../WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js | 3 ++- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java index f45929b215..bc852d43c6 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java +++ b/org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java @@ -222,7 +222,7 @@ public class AtmosphereServerPush implements ServerPush { boolean suspend = !desktopCtrl.scheduledServerPush(); if (suspend) { if (!resource.isSuspended()) { - resource.suspend(-1, true); + resource.suspend(-1, false); } this.resource.set(resource); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java index 2d90bc891c..76975def47 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ExportAction.java @@ -173,7 +173,6 @@ public class ExportAction implements EventListener exportFile(); else if (event.getName().equals(DialogEvents.ON_WINDOW_CLOSE)) { panel.hideBusyMask(); - panel.getComponent().invalidate(); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java index 5cb17f349f..8c772f110f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/FileImportAction.java @@ -247,7 +247,6 @@ public class FileImportAction implements EventListener importFile(); } else if (event.getName().equals(DialogEvents.ON_WINDOW_CLOSE)) { panel.hideBusyMask(); - panel.getComponent().invalidate(); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js b/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js index 2efeaaa2bc..71c3edf62a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js +++ b/org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js @@ -24,7 +24,8 @@ this.timeout = timeout; }, _schedule: function() { - if (this.failures < 100) { + if (this.failures < 20) { + this._req = null; setTimeout(this.proxy(this._send), this.delay); } else { this.stop();