Changeset 7051


Ignore:
Timestamp:
10/08/10 10:27:35 (9 years ago)
Author:
callan
Message:

Handle NPE when accessing UUID filename. (Fixes downstream  omero:#3038)

File:
1 edited

Legend:

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

    r6978 r7051  
    567567        // hackish workaround for files exported by OMERO that have an 
    568568        // incorrect dimension order 
     569        String uuidFileName = ""; 
     570        try { 
     571          uuidFileName = meta.getUUIDFileName(i, 0); 
     572        } 
     573        catch (NullPointerException e) { } 
    569574        if (meta.getChannelCount(i) > 0 && meta.getChannelName(i, 0) == null && 
    570575          meta.getTiffDataCount(i) > 0 && 
    571           meta.getUUIDFileName(i, 0).indexOf("__omero_export") != -1) 
     576          uuidFileName.indexOf("__omero_export") != -1) 
    572577        { 
    573578          int zIndex = core[s].dimensionOrder.indexOf("Z"); 
Note: See TracChangeset for help on using the changeset viewer.