Changeset 6922


Ignore:
Timestamp:
09/14/10 10:10:29 (9 years ago)
Author:
callan
Message:

Merging r6367 from Trunk. (See #560)

Location:
branches/4.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1

    • Property svn:mergeinfo changed
      /trunkmerged: 6367
  • branches/4.1/components/bio-formats/src/loci/formats/in/MetamorphReader.java

    r6919 r6922  
    284284 
    285285      while (!line.equals("\"EndFile\"")) { 
    286         String key = line.substring(1, line.indexOf(",") - 1).trim(); 
    287         String value = line.substring(line.indexOf(",") + 1).trim(); 
     286        int comma = line.indexOf(","); 
     287        if (comma <= 0) continue; 
     288        String key = line.substring(1, comma - 1).trim(); 
     289        String value = line.substring(comma + 1).trim(); 
    288290 
    289291        addGlobalMeta(key, value); 
Note: See TracChangeset for help on using the changeset viewer.