1 files changed, 12 insertions, 0 deletions
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
index a94616e64a5..188581b1c41 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/src/org/eclipse/papyrus/cdo/core/resource/CDOAwareCommandStack.java
@@ -9,6 +9,8 @@
  * Contributors:
  *   CEA LIST - Initial API and implementation
  *   Christian W. Damus (CEA) - bug 402525
+ *   Christian W. Damus (CEA) - bug 432813
+ *   
  *****************************************************************************/
 package org.eclipse.papyrus.cdo.core.resource;
 
@@ -40,6 +42,16 @@ public class CDOAwareCommandStack extends NestingNotifyingWorkspaceCommandStack
 	}
 
 	@Override
+	public void dispose() {
+		IOperationHistory history = getOperationHistory();
+		if(history != null) {
+			CDOUndoContext.flushAll(history);
+		}
+
+		super.dispose();
+	}
+
+	@Override
 	protected NestingNotifyingWorkspaceCommandStack createNestedCommandStack(IOperationHistory history) {
 		return new CDOAwareCommandStack(true, history);
 	}