Changeset 6414


Ignore:
Timestamp:
05/28/10 07:48:20 (10 years ago)
Author:
callan
Message:

Fixed some further NPEs when reading OME-TIFF files with no UUID objects.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/OMETiffReader.java

    r6413 r6414  
    380380        LOGGER.debug("    TiffData[{}] {", td); 
    381381        // extract TiffData parameters 
    382          
    383         String filename = meta.getUUIDFileName(i, td); 
    384         // TODO 
    385         //String uuid = meta.getTiffDataUUID(i, td); 
     382        String filename = null; 
    386383        String uuid = null; 
     384        try { 
     385          filename = meta.getUUIDFileName(i, td); 
     386        } catch (NullPointerException e) { 
     387          LOGGER.debug("Ignoring null UUID object when retrieving filename."); 
     388        } 
     389        try { 
     390          uuid = meta.getUUIDValue(i, td); 
     391        } catch (NullPointerException e) { 
     392          LOGGER.debug("Ignoring null UUID object when retrieving value."); 
     393        } 
    387394        Integer tdIFD = meta.getTiffDataIFD(i, td); 
    388395        int ifd = tdIFD == null ? 0 : tdIFD.intValue(); 
Note: See TracChangeset for help on using the changeset viewer.