Bugfix merge of existing readsets

Author: bbimber

SequenceAnalysis/src/org/labkey/sequenceanalysis/pipeline/ReadsetCreationTask.java

@@ -173,7 +173,8 @@ private void importReadsets() throws PipelineJobException
                 SequenceReadsetImpl r = (SequenceReadsetImpl)rs;
                 getJob().getLogger().info("Starting readset " + r.getName());
 
-                List<ReadDataImpl> preexistingReadData = ((SequenceReadsetImpl)SequenceAnalysisService.get().getReadset(r.getReadsetId(), getJob().getUser())).getReadDataImpl();
+                boolean readsetExists = r.getReadsetId() != null && r.getReadsetId() > 0;
+                List<ReadDataImpl> preexistingReadData = readsetExists ? ((SequenceReadsetImpl)SequenceAnalysisService.get().getReadset(r.getReadsetId(), getJob().getUser())).getReadDataImpl() : Collections.emptyList();
                 boolean readsetExistsWithData = !preexistingReadData.isEmpty();
                 if (readsetExistsWithData)
                 {
@@ -183,8 +184,7 @@ private void importReadsets() throws PipelineJobException
                 }
 
                 SequenceReadsetImpl row;
-                boolean readsetWillBeCreated = true;
-                if (!readsetExistsWithData)
+                if (!readsetExists)
                 {
                     row = new SequenceReadsetImpl();
 
@@ -235,10 +235,7 @@ private void importReadsets() throws PipelineJobException
                         row.setCreated(new Date());
                         row.setModifiedBy(getJob().getUser().getUserId());
                         row.setModified(new Date());
-                    }
-                    else
-                    {
-                        readsetWillBeCreated = false;
+                        readsetExists = false;
                     }
                 }
 
@@ -361,7 +358,7 @@ private void importReadsets() throws PipelineJobException
                 row.setReadData(readDatasToCreate);
 
                 SequenceReadsetImpl newRow;
-                if (readsetWillBeCreated)
+                if (!readsetExists)
                 {
                     newRow = Table.insert(getJob().getUser(), readsetTable, row);
                     getJob().getLogger().info("Created readset: " + newRow.getReadsetId());