[492156] Fix memory leak at session closing

If one of the semantic resource is not in the ResourceSet of the
session, it is possible with a resource loaded from its URI http://xxxx,
the SemanticCrossReferencer is not removed from this resource at the
closing of the session.
With this commit, the DASI takes the same list of resources used during
SessionLazyCrossReferencer.initialize(), to remove the
SemanticCrossReferencer during the closing of the session.

Bug: 492156
Change-Id: I9e0b5af0209e55c71d5555761bd5ee2f73dd705e
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

1 files changed, 14 insertions, 0 deletions

diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java
index b5e09abe86..89d4a648fa 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/DAnalysisSessionImpl.java
@@ -299,6 +299,20 @@ public class DAnalysisSessionImpl extends DAnalysisSessionEObjectImpl implements
             disableCrossReferencerResolve(resource);
             resource.eAdapters().clear();
         }
+        // Also disable resolveProxy capability and remove semantic cross
+        // referencer from all resources where it was installed
+        // (SessionLazyCrossReferencer.initialize()).
+        Collection<Resource> semanticResources = getSemanticResources();
+        Collection<Resource> controlledResources = getControlledResources();
+        Set<Resource> allSessionResources = getAllSessionResources();
+        Object semanticCrossReferencer = getSemanticCrossReferencer();
+        Iterable<Resource> resources = Iterables.concat(semanticResources, controlledResources, allSessionResources);
+        for (Resource resource : resources) {
+            if (!(resourceSet.getResources().contains(resource))) {
+                disableCrossReferencerResolve(resource);
+                resource.eAdapters().remove(semanticCrossReferencer);
+            }
+        }
 
         for (final DAnalysis analysis : Iterables.filter(allAnalyses(), Predicates.notNull())) {
             removeAdaptersOnAnalysis(analysis);