diff options
| author | Laurent Fasani | 2016-01-08 15:18:09 +0000 |
|---|---|---|
| committer | Laurent Redor | 2016-02-03 14:21:40 +0000 |
| commit | c1efa7982a432a2ee2d0047be7b70690c444a9fa (patch) | |
| tree | 41d36da2f490a7cc93c566973a321fa56e26416c | |
| parent | 740b2d85bf62aea5de5693759adb6765df319e6a (diff) | |
| download | org.eclipse.sirius-c1efa7982a432a2ee2d0047be7b70690c444a9fa.tar.gz org.eclipse.sirius-c1efa7982a432a2ee2d0047be7b70690c444a9fa.tar.xz org.eclipse.sirius-c1efa7982a432a2ee2d0047be7b70690c444a9fa.zip | |
[485399] Fix NPE when resource is reloaded
Bug: 485399
Change-Id: I648d88f17b865106f0da034f05131ac6acab613a
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>
Fast-tracked-by: Laurent Redor <laurent.redor@obeo.fr>
| -rw-r--r-- | plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/resource/LoadEMFResource.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/resource/LoadEMFResource.java b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/resource/LoadEMFResource.java index d8110363a4..5f96e7f952 100644 --- a/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/resource/LoadEMFResource.java +++ b/plugins/org.eclipse.sirius/src/org/eclipse/sirius/business/api/resource/LoadEMFResource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES and others. + * Copyright (c) 2010, 2016 THALES GLOBAL SERVICES and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -66,7 +66,7 @@ public class LoadEMFResource implements Runnable { if (!res.getErrors().isEmpty()) { // The file was previously loaded with errors. It might have // changed, unload it before reload. - unload(); + res.unload(); } res.load(getOptions()); } |