Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java')
-rw-r--r--extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
index 16f0c0992c7..8616893ffb1 100644
--- a/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
+++ b/extraplugins/alf/core/org.eclipse.papyrus.uml.alf.text/src/org/eclipse/papyrus/uml/alf/text/representation/AlfTextualRepresentation.java
@@ -168,7 +168,7 @@ public class AlfTextualRepresentation extends TextualRepresentation
* @return this - the current textual representation
*/
public AlfTextualRepresentation rebase(AlfTextualRepresentation representation) {
- if (this.getOwner() == representation.getOwner()) {
+ if (representation!= null && this.getOwner() == representation.getOwner()) {
BackupState state = new BackupState();
state.status = representation.getStatus();
state.timestamp = new Timestamp(representation.getModificationDate());

Back to the top