Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas FAUVERGUE2017-05-16 07:35:18 +0000
committervincent lorenzo2017-05-16 08:30:45 +0000
commitdda713e66ea56e0bd94a60cefdae72b8e287a18b (patch)
tree8fbf7bedce928d8256dee8c3d24a086863d5eb8c /plugins
parent04d9af8b965a774430c99b0cf0efd931eb200f2e (diff)
downloadorg.eclipse.papyrus-dda713e66ea56e0bd94a60cefdae72b8e287a18b.tar.gz
org.eclipse.papyrus-dda713e66ea56e0bd94a60cefdae72b8e287a18b.tar.xz
org.eclipse.papyrus-dda713e66ea56e0bd94a60cefdae72b8e287a18b.zip
Bug 516690: NullPointerException in
UMLInternationalizationKeyResolver.getKey https://bugs.eclipse.org/bugs/show_bug.cgi?id=516690 Manage possible NullPointer in UML Key Resolver Change-Id: Ifdd105375a398128b2accc054764f4c968be0890 Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/src/org/eclipse/papyrus/uml/internationalization/utils/UMLInternationalizationKeyResolver.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/src/org/eclipse/papyrus/uml/internationalization/utils/UMLInternationalizationKeyResolver.java b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/src/org/eclipse/papyrus/uml/internationalization/utils/UMLInternationalizationKeyResolver.java
index 641a8e94ab0..54f411f4b2c 100644
--- a/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/src/org/eclipse/papyrus/uml/internationalization/utils/UMLInternationalizationKeyResolver.java
+++ b/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization/src/org/eclipse/papyrus/uml/internationalization/utils/UMLInternationalizationKeyResolver.java
@@ -132,7 +132,7 @@ public class UMLInternationalizationKeyResolver extends InternationalizationKeyR
// Use the shortest qualified name for the control mode if needed
boolean shortestQualifiedNameUsed = false;
- if (superElementInSameResource.eContainer() != null) {
+ if (null != superElementInSameResource && null != superElementInSameResource.eContainer()) {
List<String> shortestQualifiedNames = NameResolutionUtils.getShortestQualifiedNames(
(NamedElement) entry.getKey(), (Namespace) superElementInSameResource.eContainer(), false);
if (!shortestQualifiedNames.isEmpty()) {

Back to the top