Changeset 4820

Timestamp:

Mar 18, 2009, 2:18:46 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1238: Check performance of BioAssaySetExporter?

Fixes a NullPointerException?

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java (modified) (4 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/BioAssaySetExporter.java

@@ -352 +352 @@
     checkInterrupted();
     if (progress != null) progress.display(10, "Loading reporter information...");
-    Map<Integer, String> reporterLine = getBaseFileReporterFields(dc, bas.getPositionData(), 
+    Map<Integer, String> reporterLine = getBaseFileReporterFields(dc, bas, bas.getPositionData(), 
         qis, reporterFields, mergeReporters);
     checkInterrupted();
@@ -491 +491 @@
     checkInterrupted();
     if (progress != null) progress.display(10, "Loading reporter information...");
-    Map<Integer, String> reporterLine = getBaseFileReporterFields(dc, bas.getPositionData(), 
+    Map<Integer, String> reporterLine = getBaseFileReporterFields(dc, bas, bas.getPositionData(), 
         qis, reporterFields, mergeReporters);
     for (BioAssay ba : assays)
@@ -1034 +1034 @@
   }
 
-  private Map<Integer, String> getBaseFileReporterFields(DbControl dc, DynamicPositionQuery query, 
+  private Map<Integer, String> getBaseFileReporterFields(DbControl dc, BioAssaySet bas,
+      DynamicPositionQuery query, 
       Map<String, QueryItem> queryMap, List<String> reporterFields, boolean mergeOnReporters)
     throws SQLException
@@ -1441 +1442 @@
     try
     {
-      bas = (BioAssaySet)job.getValue("bioAssaySet");
+      BioAssaySet bas = (BioAssaySet)job.getValue("bioAssaySet");
       bas = BioAssaySet.getById(dc, bas.getId());
       boolean attachToBioAssaySet = Boolean.TRUE.equals(job.getValue("attachToBioAssaySet"));