Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban Dugueperoux2016-09-20 12:57:08 +0000
committerPierre-Charles David2016-09-22 12:53:17 +0000
commitee5d0e4c74d8114fb4df27e512e04d2adc2c907d (patch)
treec9670d80a2a7e4cbcaa3a85828f2d1dc980e40e9
parentd1b8f369e2b34d5a3a969095f23395db7d5d5f7e (diff)
downloadorg.eclipse.sirius-ee5d0e4c74d8114fb4df27e512e04d2adc2c907d.tar.gz
org.eclipse.sirius-ee5d0e4c74d8114fb4df27e512e04d2adc2c907d.tar.xz
org.eclipse.sirius-ee5d0e4c74d8114fb4df27e512e04d2adc2c907d.zip
[496667] Customize DialectEditorCloser creation to avoid NPEs
The DialectEditor.getRepresentation() javadoc clearly indicates that the representation can be null. This commit allows to avoid the creation of a DialectEditorCloser and its DialectEditorCloserFilter notification listener if there is no representation. Bug: 496667 Change-Id: I0cf9c6f422a085a9101151c351ec2676c5f0f617 Signed-off-by: Maxime Porhel <maxime.porhel@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java
index 3dfc801c4f..00349a7534 100644
--- a/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java
+++ b/plugins/org.eclipse.sirius.ui/src/org/eclipse/sirius/ui/business/internal/session/EditingSession.java
@@ -140,7 +140,9 @@ public class EditingSession implements IEditingSession, ISaveablesSource, Refres
reorderEditorsIfNeeded(dialectEditor);
- dialectEditorClosers.put(dialectEditor, new DialectEditorCloser(this, dialectEditor));
+ if (dialectEditor.getRepresentation() != null) {
+ dialectEditorClosers.put(dialectEditor, new DialectEditorCloser(this, dialectEditor));
+ }
}
}

Back to the top