Bug 535644 - [Internationalization] Possibility of NPE during model save

- Fix local dependend "if condition"
- Add additional conditions

Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>

1 files changed, 6 insertions, 4 deletions

diff --git a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
index 0ab2a1d5c08..83e74436069 100644
--- a/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
+++ b/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization/src/org/eclipse/papyrus/infra/internationalization/modelresource/InternationalizationModelResource.java
@@ -633,7 +633,7 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
 
 		// Calculate the new URI with the correct name (depending to locale)
 		URI newBaseURI = newURIwithoutExtension.trimFileExtension();
-		if (null == locale || !locale.toString().isEmpty()) {
+		if (null != locale && !locale.toString().isEmpty()) {
 			String lastSegment = newBaseURI.lastSegment();
 			lastSegment = lastSegment + LocaleNameResolver.UNDERSCORE + locale.toString();
 			newBaseURI = newBaseURI.trimSegments(1);
@@ -645,9 +645,11 @@ public class InternationalizationModelResource extends AbstractModelWithSharedRe
 		resource.setURI(newBaseURI);
 
 		// Remove the old resource URI from map
-		propertiesByLocale.get(initialURI).remove(locale);
-		if (propertiesByLocale.get(initialURI).isEmpty()) {
-			propertiesByLocale.remove(initialURI);
+		if (locale != null) {
+			propertiesByLocale.get(initialURI).remove(locale);
+			if (propertiesByLocale.get(initialURI).isEmpty()) {
+				propertiesByLocale.remove(initialURI);
+			}
 		}
 
 		// Add the new resource URI from map