From f996ee5045652defe92abbea46b94305d16ca20c Mon Sep 17 00:00:00 2001 From: jprocter Date: Fri, 12 Jun 2009 15:57:08 +0000 Subject: [PATCH] prevent dbref->map->to->datasetsequence->dbref-> type cycles --- src/jalview/io/vamsas/Dbref.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/jalview/io/vamsas/Dbref.java b/src/jalview/io/vamsas/Dbref.java index 11c62b5..5698228 100644 --- a/src/jalview/io/vamsas/Dbref.java +++ b/src/jalview/io/vamsas/Dbref.java @@ -106,15 +106,18 @@ public class Dbref extends Rangetype { if (mp.getTo().getDatasetSequence() == null) { - // sync the dataset sequence, if it hasn't been done already. - Datasetsequence dssync = new Datasetsequence( + if (!dsReg.isInvolvedInDsitem(mp.getTo())) + { + // sync the dataset sequence, if it hasn't been done already. + Datasetsequence dssync = new Datasetsequence( datastore, mp.getTo(), (mp.getMappedWidth() == mp.getWidth()) ? sequence .getDictionary() : ((mp.getMappedWidth() == 3) ? uk.ac.vamsas.objects.utils.SymbolDictionary.STANDARD_AA : uk.ac.vamsas.objects.utils.SymbolDictionary.STANDARD_NA), ds); - // add a mapping between new dataset sequence and sequence associated with the database reference + // add a mapping between new dataset sequence and sequence associated with the database reference + } } else { log.debug("Ignoring non-dataset sequence mapping."); -- 1.7.10.2