[311758] Removing adapters while closing a view.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=311758

1 files changed, 7 insertions, 2 deletions

diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
index 013972fbf1..4d2f97b97f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/lifecycle/Lifecycle.java
@@ -59,7 +59,7 @@ public class Lifecycle extends Notifier implements ILifecycle
         }
 
         lock();
-        lifecycleState = LifecycleState.ACTIVATING;
+
         IListener[] listeners = getListeners();
         if (listeners != null)
         {
@@ -67,6 +67,8 @@ public class Lifecycle extends Notifier implements ILifecycle
         }
 
         doBeforeActivate();
+
+        lifecycleState = LifecycleState.ACTIVATING;
         doActivate();
 
         if (!isDeferredActivation())
@@ -111,7 +113,7 @@ public class Lifecycle extends Notifier implements ILifecycle
         }
 
         lock();
-        lifecycleState = LifecycleState.DEACTIVATING;
+
         doBeforeDeactivate();
         IListener[] listeners = getListeners();
         if (listeners != null)
@@ -119,9 +121,12 @@ public class Lifecycle extends Notifier implements ILifecycle
           fireEvent(new LifecycleEvent(this, ILifecycleEvent.Kind.ABOUT_TO_DEACTIVATE), listeners);
         }
 
+        lifecycleState = LifecycleState.DEACTIVATING;
         doDeactivate();
+
         lifecycleState = LifecycleState.INACTIVE;
         unlock();
+
         if (listeners != null)
         {
           fireEvent(new LifecycleEvent(this, ILifecycleEvent.Kind.DEACTIVATED), listeners);