Changeset 7508


Ignore:
Timestamp:
01/11/11 14:28:21 (9 years ago)
Author:
melissa
Message:

Fixed NPE.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/ScreenReader.java

    r7499 r7508  
    183183    } 
    184184    String[] readerFiles = readers[plate][well].getSeriesUsedFiles(noPixels); 
    185     for (String f : readerFiles) { 
    186       files.add(f); 
     185    if (readerFiles != null) { 
     186      for (String f : readerFiles) { 
     187        files.add(f); 
     188      } 
    187189    } 
    188190    return files.toArray(new String[files.size()]); 
  • trunk/components/bio-formats/src/loci/formats/in/ScreenReader.java

    r7493 r7508  
    183183    } 
    184184    String[] readerFiles = readers[plate][well].getSeriesUsedFiles(noPixels); 
    185     for (String f : readerFiles) { 
    186       files.add(f); 
     185    if (readerFiles != null) { 
     186      for (String f : readerFiles) { 
     187        files.add(f); 
     188      } 
    187189    } 
    188190    return files.toArray(new String[files.size()]); 
Note: See TracChangeset for help on using the changeset viewer.