Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Monnier2015-01-27 12:52:16 +0000
committerSteve Monnier2015-01-27 12:52:16 +0000
commitfb41a5ac8902f246d1258920bafec42d43c05c4d (patch)
treea7fa6292debb8da92caa6a6b95efef80f8f0aa0f
parentf9f2df782aa4f5f018bd184a16b2826a543a1556 (diff)
downloadorg.eclipse.sirius-fb41a5ac8902f246d1258920bafec42d43c05c4d.tar.gz
org.eclipse.sirius-fb41a5ac8902f246d1258920bafec42d43c05c4d.tar.xz
org.eclipse.sirius-fb41a5ac8902f246d1258920bafec42d43c05c4d.zip
[453328] Test validation on null file
A test has been added to avoid NPE when their is no file at a given path. Bug: 453328 Change-Id: I81b2fdf911b736942b8151d88b2427f6ca02b965 Signed-off-by: Steve Monnier <steve.monnier@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/WorkspaceImageFigure.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/WorkspaceImageFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/WorkspaceImageFigure.java
index e636185ac5..7ab8524d8d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/WorkspaceImageFigure.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/WorkspaceImageFigure.java
@@ -105,7 +105,7 @@ public class WorkspaceImageFigure extends AbstractTransparentImage implements IW
if (path != null) {
final File imageFile = WorkspaceFileResourceChangeListener.getInstance().getFileFromURI(path);
ImageDescriptor desc = null;
- if (WorkspaceFileResourceChangeListener.getInstance().getReadStatusOfFile(imageFile)) {
+ if (imageFile != null && WorkspaceFileResourceChangeListener.getInstance().getReadStatusOfFile(imageFile)) {
try {
desc = WorkspaceFileResourceChangeListener.getInstance().findImageDescriptor(imageFile);
} catch (MalformedURLException e) {

Back to the top