diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java index 1b9a95a..b33f225 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/MonitorDialog.java @@ -451,6 +451,9 @@ public class MonitorDialog extends Window implements MonitorUpdaterListener { } protected void close() { + if(progressUpdater!=null){ + progressUpdater.cancel(); + } hide(); } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java index 7ff18eb..70ce59e 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundDialog.java @@ -78,6 +78,9 @@ public class MonitorBackgroundDialog extends Window { } protected void close() { + if (monitorBackgroundPanel != null) { + monitorBackgroundPanel.cancelMonitorBackgroundUpdater(); + } hide(); } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java index 9726b17..3a3792e 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoDialog.java @@ -71,7 +71,11 @@ public class MonitorBackgroundInfoDialog extends Window { } protected void close() { + if(monitorBackgroundInfoPanel!=null){ + monitorBackgroundInfoPanel.cancelMonitorBackgroundInfoUpdater(); + } hide(); + } diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java index 9876756..ccd19ce 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundInfoPanel.java @@ -408,6 +408,13 @@ public class MonitorBackgroundInfoPanel extends FramedPanel implements monitorBackgroundInfoUpdater.scheduleRepeating(STATUS_POLLING_DELAY); monitorBackgroundInfoUpdater.run(); } + + public void cancelMonitorBackgroundInfoUpdater(){ + if(monitorBackgroundInfoUpdater!=null){ + monitorBackgroundInfoUpdater.cancel(); + } + } + protected void close() { if (parent != null) { diff --git a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java index 55aea8f..45d8701 100644 --- a/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/monitorwidget/client/background/MonitorBackgroundPanel.java @@ -236,9 +236,16 @@ public class MonitorBackgroundPanel extends FramedPanel implements if (parent != null) { parent.close(); } - monitorBackgroundUpdater.cancel(); + } + + public void cancelMonitorBackgroundUpdater(){ + if(monitorBackgroundUpdater!=null){ + monitorBackgroundUpdater.cancel(); + } + } + private void addChildrensToStore() { if (backgroundOperationMonitorList != null) {