diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 63175f224b7..ce6d55a61c8 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -144,6 +144,9 @@ Other Changes * SOLR-5264: Move methods for getting config information from FieldMutatingUpdateProcessorFactory to NamedList. (Shawn Heisey) +* SOLR-5319: Remove unused and incorrect router name from Collection ZK nodes. + (Jessica Cheng via shalin) + ================== 4.5.0 ================== Versions of Major Components diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index 12942100b8b..4b05167ee3a 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -1160,18 +1160,6 @@ public final class ZkController { getConfName(collection, collectionPath, collectionProps); } - if (collectionProps.get(DocCollection.DOC_ROUTER) == null) { - Object numShards = collectionProps.get(ZkStateReader.NUM_SHARDS_PROP); - if (numShards == null) { - numShards = System.getProperty(ZkStateReader.NUM_SHARDS_PROP); - } - if (numShards == null) { - collectionProps.put(DocCollection.DOC_ROUTER, ZkNodeProps.makeMap("name",ImplicitDocRouter.NAME)); - } else { - collectionProps.put(DocCollection.DOC_ROUTER, ZkNodeProps.makeMap("name", DocRouter.DEFAULT_NAME)); - } - } - collectionProps.remove(ZkStateReader.NUM_SHARDS_PROP); // we don't put numShards in the collections properties ZkNodeProps zkProps = new ZkNodeProps(collectionProps);