Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2016-02-19 14:16:23 +0000
committerPierre-Charles David2016-02-19 14:18:33 +0000
commit91f50a1b0edcc95fd1d9cf5179b9e79bf6154d22 (patch)
tree2b9a44fa355c36fa8cd0b91cbd120f25396b93e1
parent5218098b788995e495d3466b26939e529e96961e (diff)
downloadorg.eclipse.sirius-91f50a1b0edcc95fd1d9cf5179b9e79bf6154d22.tar.gz
org.eclipse.sirius-91f50a1b0edcc95fd1d9cf5179b9e79bf6154d22.tar.xz
org.eclipse.sirius-91f50a1b0edcc95fd1d9cf5179b9e79bf6154d22.zip
[482528] Fix a potential NPE
Bug: 482528 Change-Id: I33f1eb3e1ffb50c35a34f4d6c07ea4a52eba06da Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
-rw-r--r--incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
index aa4a8b3a62..8da87085b3 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/tabprovider/ViewDescriptionConverter.java
@@ -171,7 +171,10 @@ public class ViewDescriptionConverter {
}
private String getExpressionForOperation(InitialOperation initialOperation) {
- return "aql:self.executeOperation('" + EcoreUtil.getURI(initialOperation).toString() + "')";
+ if (initialOperation != null) {
+ return "aql:self.executeOperation('" + EcoreUtil.getURI(initialOperation).toString() + "')";
+ }
+ return null;
}
private EEFTextDescription createEEFTextDescription(TextAreaDescription textDescription) {

Back to the top