Projects >> lucene-solr >>84703f47f85d0bebb001dc9fc2bc04fb6899f2d2

Chunk
Conflicting content
public class RandomCodec extends Lucene40Codec {
  /** shuffled list of postingsformats to use for new mappings */
  private List formats = new ArrayList();
<<<<<<< HEAD
  /** memorized field->postingsformat mappings */
=======
>>>>>>> 2102f03c12c3c67a9acc8d6c7fd6c7e7600a64fa
  // note: we have to sync this map even though its just for debugging/toString, 
  // otherwise DWPT's .toString() calls that iterate over the map can 
  // cause concurrentmodificationexception if indexwriter's infostream is on
Solution content
public class RandomCodec extends Lucene40Codec {
  /** shuffled list of postingsformats to use for new mappings */
  private List formats = new ArrayList();
  /** memorized field->postingsformat mappings */
  // note: we have to sync this map even though its just for debugging/toString, 
  // otherwise DWPT's .toString() calls that iterate over the map can 
  // cause concurrentmodificationexception if indexwriter's infostream is on
File
RandomCodec.java
Developer's decision
Version 1
Kind of conflict
Comment