Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reuse existing code, baseUrl and coreName can no longer be null 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1378512 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sami Siren 2012-08-29 12:06:03 +00:00
parent 61385c2817
commit ae43103d15
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
solr/core/src/java/org/apache/solr/cloud/Overseer.java
View File

@ -166,17 +166,12 @@ public class Overseer {
} else if (DELETECORE.equals(operation)) { } else if (DELETECORE.equals(operation)) {
clusterState = removeCore(clusterState, message); clusterState = removeCore(clusterState, message);
} else if (ZkStateReader.LEADER_PROP.equals(operation)) { } else if (ZkStateReader.LEADER_PROP.equals(operation)) {
StringBuilder sb = new StringBuilder();
String baseUrl = message.get(ZkStateReader.BASE_URL_PROP); String baseUrl = message.get(ZkStateReader.BASE_URL_PROP);
String coreName = message.get(ZkStateReader.CORE_NAME_PROP); String coreName = message.get(ZkStateReader.CORE_NAME_PROP);
sb.append(baseUrl); final String leaderUrl = ZkCoreNodeProps.getCoreUrl(baseUrl, coreName);
if (!baseUrl.endsWith("/")) sb.append("/");
sb.append(coreName == null ? "" : coreName);
if (!(sb.substring(sb.length() - 1).equals("/"))) sb
.append("/");
clusterState = setShardLeader(clusterState, clusterState = setShardLeader(clusterState,
message.get(ZkStateReader.COLLECTION_PROP), message.get(ZkStateReader.COLLECTION_PROP),
message.get(ZkStateReader.SHARD_ID_PROP), sb.toString()); message.get(ZkStateReader.SHARD_ID_PROP), leaderUrl);
} else { } else {
throw new RuntimeException("unknown operation:" + operation throw new RuntimeException("unknown operation:" + operation
+ " contents:" + message.getProperties()); + " contents:" + message.getProperties());

6
solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
View File

@ -24,7 +24,6 @@ public class ZkCoreNodeProps {
this.nodeProps = nodeProps; this.nodeProps = nodeProps;
} }
// may return null
public String getCoreUrl() { public String getCoreUrl() {
return getCoreUrl(nodeProps.get(ZkStateReader.BASE_URL_PROP), nodeProps.get(ZkStateReader.CORE_NAME_PROP)); return getCoreUrl(nodeProps.get(ZkStateReader.BASE_URL_PROP), nodeProps.get(ZkStateReader.CORE_NAME_PROP));
} }
@ -51,13 +50,10 @@ public class ZkCoreNodeProps {
public static String getCoreUrl(String baseUrl, String coreName) { public static String getCoreUrl(String baseUrl, String coreName) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (baseUrl == null) return null;
if (coreName == null) return null;
sb.append(baseUrl); sb.append(baseUrl);
if (!baseUrl.endsWith("/")) sb.append("/"); if (!baseUrl.endsWith("/")) sb.append("/");
sb.append(coreName == null ? "" : coreName); sb.append(coreName);
if (!(sb.substring(sb.length() - 1).equals("/"))) sb.append("/"); if (!(sb.substring(sb.length() - 1).equals("/"))) sb.append("/");
return sb.toString(); return sb.toString();
} }