From 627cb878d7cec8420f94811e281fdb7758a0c59f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 21 Oct 2014 11:21:50 +0000 Subject: [PATCH] bugfix for clone and setDnaSample --- .../main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java | 2 +- .../main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java index 757f11d8d0..571de3c5ab 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaSample.java @@ -188,7 +188,7 @@ public class DnaSample extends DerivedUnit implements Cloneable { //sequenceSet result.sequences = new HashSet(); for(Sequence sequence : this.sequences) { - result.addSequence(sequence); + result.addSequence((Sequence)sequence.clone()); } //no changes to: bankNumber return result; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java index f23e9e5a54..144f043b6b 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/Sequence.java @@ -212,7 +212,7 @@ public class Sequence extends AnnotatableEntity implements Cloneable{ //TODO implement full bidirectionality protected void setDnaSample(DnaSample dnaSample) { this.dnaSample = dnaSample; - if (!dnaSample.getSequences().contains(this)){ + if (dnaSample != null && !dnaSample.getSequences().contains(this)){ throw new RuntimeException("Don't use DNA setter"); } } -- 2.34.1