PERF : Remove correctly UIRunnables when closing UIContext

Author: NSV

ponysdk/src/main/java/com/ponysdk/core/server/application/UIContext.java

@@ -626,6 +626,7 @@ public void onDestroy() {
         acquire();
         try {
             doDestroy();
+            context.deregisterUIContext(ID);
         } finally {
             release();
         }
@@ -640,16 +641,7 @@ void destroyFromApplication() {
         if (!isAlive()) return;
         acquire();
         try {
-            alive = false;
-            destroyListeners.forEach(listener -> {
-                try {
-                    listener.onBeforeDestroy(this);
-                } catch (final AlreadyDestroyedApplication e) {
-                    if (log.isDebugEnabled()) log.debug("Exception while destroying UIContext #" + getID(), e);
-                } catch (final Exception e) {
-                    log.error("Exception while destroying UIContext #" + getID(), e);
-                }
-            });
+            doDestroy();
             socket.close();
         } finally {
             release();
@@ -666,6 +658,7 @@ public void destroy() {
         acquire();
         try {
             doDestroy();
+            context.deregisterUIContext(ID);
             socket.close();
         } finally {
             release();
@@ -686,7 +679,6 @@ private void doDestroy() {
                 log.error("Exception while destroying UIContext #" + getID(), e);
             }
         });
-        context.deregisterUIContext(ID);
     }
 
     /**

ponysdk/src/main/java/com/ponysdk/core/server/concurrent/PScheduler.java

@@ -149,19 +149,26 @@ private <R> Consumer<R> delegate0(final Consumer<R> callback, final UIContext ui
         return new UIDelegator<>(callback, uiContext);
     }
 
+    private void destroy(final UIContext uiContext) {
+        final Set<UIRunnable> uiRunnables = runnablesByUIContexts.remove(uiContext);
+        if (uiRunnables != null) uiRunnables.forEach(UIRunnable::onCancel);
+        executor.purge();
+    }
+
     private void purge(final UIRunnable uiRunnable) {
+        final Set<UIRunnable> uiRunnables = runnablesByUIContexts.get(uiRunnable.getUIContext());
+        if (uiRunnables != null) uiRunnables.remove(uiRunnable);
         executor.purge();
-        runnablesByUIContexts.get(uiRunnable.getUiContext()).remove(uiRunnable);
     }
 
     private void registerTask(final UIRunnable runnable) {
-        final UIContext uiContext = runnable.getUiContext();
+        final UIContext uiContext = runnable.getUIContext();
         Set<UIRunnable> runnables = runnablesByUIContexts.get(uiContext);
         if (runnables == null) {
             runnables = Collections.newSetFromMap(new ConcurrentHashMap<>());
             runnables.add(runnable);
             runnablesByUIContexts.put(uiContext, runnables);
-            uiContext.addContextDestroyListener(context -> runnablesByUIContexts.remove(context).forEach(UIRunnable::cancel));
+            uiContext.addContextDestroyListener(this::destroy);
         } else {
             runnables.add(runnable);
         }
@@ -192,9 +199,7 @@ public void run() {
                 log.error("Error occurred", throwable);
                 cancel();
             } finally {
-                if (!repeated) {
-                    scheduler.purge(this);
-                }
+                if (!repeated) scheduler.purge(this);
             }
         }
 
@@ -203,16 +208,20 @@ public boolean execute() {
         }
 
         public void cancel() {
+            onCancel();
+            scheduler.purge(this);
+        }
+
+        public void onCancel() {
             this.cancelled = true;
             this.future.cancel(false);
-            scheduler.purge(this);
         }
 
         void setFuture(final ScheduledFuture<?> future) {
             this.future = future;
         }
 
-        public UIContext getUiContext() {
+        public UIContext getUIContext() {
             return uiContext;
         }
     }