Merge "Bugfix for Bug 497543"
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/choreography/AddChoreographyMessageFeature.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/choreography/AddChoreographyMessageFeature.java
index c574cd8..3e61079 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/choreography/AddChoreographyMessageFeature.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/choreography/AddChoreographyMessageFeature.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 Red Hat, Inc.
+ * Copyright (c) 2011, 2016 Red Hat, Inc and others.
* All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,6 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
+ * Horus Software GmbH - Bug 497543
*
* @author Bob Brodt
******************************************************************************/
@@ -181,6 +182,8 @@
message.setName(oldName);
} else {
// and existing one
+
+ EcoreUtil.delete(message);
message = result;
}
