410583: [Wizard] NPE in the model creation wizard

https://bugs.eclipse.org/bugs/show_bug.cgi?id=410583

1 files changed, 4 insertions, 1 deletions

diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java
index 67b63721dac..fba5f632548 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/infra/core/lifecycleevents/SaveAndDirtyService.java
@@ -162,7 +162,7 @@ public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISav
 		private boolean isUnprotected(Transaction transaction) {

 			return !Boolean.TRUE.equals(transaction.getOptions().get(Transaction.OPTION_UNPROTECTED));

 		}

-		

+

 		public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {

 			return null;

 		}

@@ -395,6 +395,9 @@ public class SaveAndDirtyService extends LifeCycleEventsProvider implements ISav
 	public boolean isDirty() {

 		// First, look if the model part (EMF) is dirty, else look at the

 		// Graphical part (GEF/GMF)

+		if(transactionalEditingDomain == null) {

+			return false;

+		}

 		return ((BasicCommandStack)transactionalEditingDomain.getCommandStack()).isSaveNeeded() || registeredIsaveablePart.isDirty();

 	}