Projects >> lucene-solr >>262bf816e129116176a84a1b68d655dd416a201d

Chunk
Conflicting content
      if(dcoreName != null) {
        defaultCoreName = dcoreName;
      }
<<<<<<< HEAD
      persistent = cfg.getBool("solr/@persistent", false);
      libDir = cfg.get("solr/@sharedLib", null);
      zkHost = cfg.get("solr/@zkHost" , null);
      adminPath = cfg.get("solr/cores/@adminPath", null);
      shareSchema = cfg.getBool("solr/cores/@shareSchema", false);
      int zkClientTimeout = cfg.getInt("solr/cores/@zkClientTimeout", 10000);
      if (zkPortOverride == null) {
        hostPort = System.getProperty("hostPort");
        if (hostPort == null) {
          hostPort = cfg.get("solr/cores/@hostPort", "8983");
        }
      } else {
        hostPort = zkPortOverride;
      }
      hostContext = cfg.get("solr/cores/@hostContext", "solr");
      host = cfg.get("solr/cores/@host", null);

=======
      persistent = cfg.getBool( "solr/@persistent", false );
      libDir     = cfg.get(     "solr/@sharedLib", null);
      adminPath  = cfg.get(     "solr/cores/@adminPath", null );
      shareSchema = cfg.getBool("solr/cores/@shareSchema", false );
>>>>>>> 249be10000912b5bb6270d3a8658e9a5fbeff6d2
      if(shareSchema){
        indexSchemaCache = new ConcurrentHashMap();
      }
Solution content
      if(dcoreName != null) {
        defaultCoreName = dcoreName;
      }
      persistent = cfg.getBool("solr/@persistent", false);
      libDir = cfg.get("solr/@sharedLib", null);
      zkHost = cfg.get("solr/@zkHost" , null);
      adminPath = cfg.get("solr/cores/@adminPath", null);
      shareSchema = cfg.getBool("solr/cores/@shareSchema", false);
      int zkClientTimeout = cfg.getInt("solr/cores/@zkClientTimeout", 10000);
      if (zkPortOverride == null) {
        hostPort = System.getProperty("hostPort");
        if (hostPort == null) {
          hostPort = cfg.get("solr/cores/@hostPort", "8983");
        }
      } else {
        hostPort = zkPortOverride;
      }
      hostContext = cfg.get("solr/cores/@hostContext", "solr");
      host = cfg.get("solr/cores/@host", null);

      if(shareSchema){
        indexSchemaCache = new ConcurrentHashMap();
      }
File
CoreContainer.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Variable