fixes for versioning

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@4280 ee4ac58c-ac51-4696-9907-e4b3aa274f04

uk/ac/sanger/artemis/chado/ChadoTransaction.java

@@ -323,6 +323,10 @@ public class ChadoTransaction
   public List getUniquename()
   {
     Vector names = new Vector();
+    
+    if(uniquename == null)
+      return names;
+    
     StringTokenizer tok = new StringTokenizer(uniquename,",");
     while(tok.hasMoreTokens())
     {

uk/ac/sanger/artemis/util/DatabaseDocument.java

@@ -721,6 +721,7 @@ public class DatabaseDocument extends Document
            tsn.getType() != ChadoTransaction.DELETE_FEATURE)
         {
           final List uniquename = tsn.getUniquename();
+          
           for(int j=0; j<uniquename.size(); j++)
             checkFeatureTimestamp(schema, (String)uniquename.get(j), 
                                   tsn.getLastModified(), dao);
@@ -760,6 +761,8 @@ public class DatabaseDocument extends Document
             dao.writeTimeLastModified(schema, (String)uniquename.get(k));
             Timestamp new_timestamp = 
                        dao.getTimeLastModified(schema, (String)uniquename.get(k));
+            if(new_timestamp == null)
+              continue;
             
             GFFStreamFeature gff_feature = (GFFStreamFeature)tsn.getFeatureObject();
             gff_feature.setLastModified(new_timestamp);