[cleanup] Set session to null after SaveSessionJob execution

After a memory analysis, we have noticed that several AirDResourceImpl
are retained by DAnalysisSessionImpl, that themselves are retained by
SaveSessionJob. The job can indeed, be retained by ProgressManager.
The session is now reset to null after the job execution. Even if Job is
supposed to be reusable (see Javadoc of Job), the SaveSessionJob do
nothing if it is reused.

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

1 files changed, 4 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java
index 6d9c7b5e8c..fae8362961 100644
--- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java
+++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/internal/session/danalysis/SaveSessionJob.java
@@ -49,7 +49,7 @@ public class SaveSessionJob extends Job {
     public IStatus run(IProgressMonitor monitor) {
         try {
             monitor.beginTask(ACTION_NAME, IProgressMonitor.UNKNOWN);
-            if (session.isOpen() && SessionStatus.DIRTY == session.getStatus()) {
+            if (session != null && session.isOpen() && SessionStatus.DIRTY == session.getStatus()) {
                 if (session instanceof DAnalysisSessionImpl) {
                     /*
                      * We can never know when the job will be scheduled, and it
@@ -75,6 +75,9 @@ public class SaveSessionJob extends Job {
             }
         } finally {
             monitor.done();
+            // Set the session to null to avoid a leak. The job is potentially
+            // kept by the ProgressManager.
+            session = null;
         }
         return Status.OK_STATUS;
     }