From b71a4dd9a6a6cc177a7ccc9dcfa9b9ff3c43637f Mon Sep 17 00:00:00 2001 From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04> Date: Thu, 14 May 2009 10:01:28 +0000 Subject: [PATCH] fix for manual ortholog / paralog inserts git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@10799 ee4ac58c-ac51-4696-9907-e4b3aa274f04 --- uk/ac/sanger/artemis/util/DatabaseDocument.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/uk/ac/sanger/artemis/util/DatabaseDocument.java b/uk/ac/sanger/artemis/util/DatabaseDocument.java index 809bc179d..0c8702923 100644 --- a/uk/ac/sanger/artemis/util/DatabaseDocument.java +++ b/uk/ac/sanger/artemis/util/DatabaseDocument.java @@ -2554,7 +2554,6 @@ public class DatabaseDocument extends Document // // check feature timestamps have not changed Vector names_checked = new Vector(); - for(int i = 0; i < sql.size(); i++) { final ChadoTransaction tsn = (ChadoTransaction)sql.get(i); @@ -2583,7 +2582,7 @@ public class DatabaseDocument extends Document } } } - + final Timestamp ts = new Timestamp(new java.util.Date().getTime()); // // commit to database @@ -2645,7 +2644,6 @@ public class DatabaseDocument extends Document else feature = dao.getFeatureByUniqueName(uniquename, tsn.getFeatureKey()); - if(feature != null) { feature.setTimeLastModified(ts); @@ -2829,8 +2827,9 @@ public class DatabaseDocument extends Document featureBySrcFeatureId.setFeatureId(Integer.parseInt(srcFeatureId)); featureloc.setFeatureBySrcFeatureId(featureBySrcFeatureId); } - - if(tsn.getFeatureObject() instanceof Feature) + + if(tsn.getFeatureObject() instanceof Feature && + tsn.getGff_feature() != null) { String keyStr = tsn.getGff_feature().getKey().getKeyString(); if(GeneUtils.isFeatureToUpdateResidues(keyStr)) -- GitLab