[501910] Fix potential NPE in SiriusCommonContentProvider

Bug: 501910
Change-Id: Iea9d224f9e694751111c7100629dd24861edb4fd
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

1 files changed, 4 insertions, 3 deletions

diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java
index be9fdd74ce..fe678735d9 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/tools/internal/views/common/navigator/SiriusCommonContentProvider.java
@@ -650,13 +650,14 @@ public class SiriusCommonContentProvider implements ICommonContentProvider {
             }
             // Can occurs during session close : the previous lists were already
             // emptied.
-            if (!Iterables.contains(resources, session.getSessionResource())) {
-                resources = Iterables.concat(resources, Collections.singletonList(session.getSessionResource()));
+            Resource sessionRessource = session.getSessionResource()
+            if (sessionResource != null && !Iterables.contains(resources, sessionRessource)) {
+                resources = Iterables.concat(resources, Collections.singletonList(sessionRessource));
             }
 
             for (Resource res : resources) {
                 try {
-                    if (res.getURI() != null && res.getURI().isPlatformResource()) {
+                    if (res != null && res.getURI() != null && res.getURI().isPlatformResource()) {
                         IFile file = WorkspaceSynchronizer.getFile(res);
                         if (file != null && file.exists() && file.getProject() != null) {
                             projectsToRefresh.add(file.getProject());